You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/04/14 06:42:00 UTC

[16/19] hive git commit: HIVE-18862: qfiles: prepare .q files for using datasets (Laszlo Bodor via Zoltan Haindrich)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q b/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
index e3b0066..0626da1 100644
--- a/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
+++ b/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q b/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
index 168aeb1..51c22be 100644
--- a/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
+++ b/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q b/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
index 1a28477..1304985 100644
--- a/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
+++ b/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 set hive.groupby.skewindata=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_cube1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_cube1.q b/ql/src/test/queries/clientnegative/groupby_cube1.q
index a0bc177..16d910b 100644
--- a/ql/src/test/queries/clientnegative/groupby_cube1.q
+++ b/ql/src/test/queries/clientnegative/groupby_cube1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 
 SELECT key, count(distinct value) FROM src GROUP BY key with cube;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_cube2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_cube2.q b/ql/src/test/queries/clientnegative/groupby_cube2.q
index f8ecb6a..34a02aa 100644
--- a/ql/src/test/queries/clientnegative/groupby_cube2.q
+++ b/ql/src/test/queries/clientnegative/groupby_cube2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 
 SELECT key, value, count(distinct value) FROM src GROUP BY key, value with cube;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_cube_multi_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_cube_multi_gby.q b/ql/src/test/queries/clientnegative/groupby_cube_multi_gby.q
index cddbe1a..e0d8ef4 100644
--- a/ql/src/test/queries/clientnegative/groupby_cube_multi_gby.q
+++ b/ql/src/test/queries/clientnegative/groupby_cube_multi_gby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table t1 like src;
 create table t2 like src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_invalid_position.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_invalid_position.q b/ql/src/test/queries/clientnegative/groupby_invalid_position.q
index 173a752..55536c6 100644
--- a/ql/src/test/queries/clientnegative/groupby_invalid_position.q
+++ b/ql/src/test/queries/clientnegative/groupby_invalid_position.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.groupby.orderby.position.alias=true;
 
 -- invalid position alias in group by

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_key.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_key.q b/ql/src/test/queries/clientnegative/groupby_key.q
index 2097015..eb529e8 100644
--- a/ql/src/test/queries/clientnegative/groupby_key.q
+++ b/ql/src/test/queries/clientnegative/groupby_key.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT concat(value, concat(value)) FROM src GROUP BY concat(value);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_rollup1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_rollup1.q b/ql/src/test/queries/clientnegative/groupby_rollup1.q
index 6366744..bce1f88 100644
--- a/ql/src/test/queries/clientnegative/groupby_rollup1.q
+++ b/ql/src/test/queries/clientnegative/groupby_rollup1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 
 SELECT key, value, count(1) FROM src GROUP BY key, value with rollup;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/groupby_rollup2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/groupby_rollup2.q b/ql/src/test/queries/clientnegative/groupby_rollup2.q
index aa19b52..ad4cf1d 100644
--- a/ql/src/test/queries/clientnegative/groupby_rollup2.q
+++ b/ql/src/test/queries/clientnegative/groupby_rollup2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 
 SELECT key, value, count(key) FROM src GROUP BY key, value with rollup;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/having1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/having1.q b/ql/src/test/queries/clientnegative/having1.q
index 71f4fd1..ced3158 100644
--- a/ql/src/test/queries/clientnegative/having1.q
+++ b/ql/src/test/queries/clientnegative/having1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 EXPLAIN SELECT * FROM src HAVING key > 300;
 SELECT * FROM src HAVING key > 300;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/illegal_partition_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/illegal_partition_type.q b/ql/src/test/queries/clientnegative/illegal_partition_type.q
index 1ab828c..08c248d 100644
--- a/ql/src/test/queries/clientnegative/illegal_partition_type.q
+++ b/ql/src/test/queries/clientnegative/illegal_partition_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- begin part(string, int) pass(string, string)
 CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' ;
 LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='second');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input1.q b/ql/src/test/queries/clientnegative/input1.q
index 92a6791..485e24e 100644
--- a/ql/src/test/queries/clientnegative/input1.q
+++ b/ql/src/test/queries/clientnegative/input1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT a.* FROM src; 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input2.q b/ql/src/test/queries/clientnegative/input2.q
index 0fe907d..241bf7f 100644
--- a/ql/src/test/queries/clientnegative/input2.q
+++ b/ql/src/test/queries/clientnegative/input2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT a.key FROM src; 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input4.q b/ql/src/test/queries/clientnegative/input4.q
index 03cf127..f4023c8 100644
--- a/ql/src/test/queries/clientnegative/input4.q
+++ b/ql/src/test/queries/clientnegative/input4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false; 
 
 set hive.mapred.mode=strict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input41.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input41.q b/ql/src/test/queries/clientnegative/input41.q
index 872ab10..06fb2d2 100644
--- a/ql/src/test/queries/clientnegative/input41.q
+++ b/ql/src/test/queries/clientnegative/input41.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 select * from 
   (select * from src 
     union all

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input4_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input4_2.q b/ql/src/test/queries/clientnegative/input4_2.q
index ca8bcda..6cf3349 100644
--- a/ql/src/test/queries/clientnegative/input4_2.q
+++ b/ql/src/test/queries/clientnegative/input4_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false; 
 
 reset hive.mapred.mode;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input_part0_neg.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input_part0_neg.q b/ql/src/test/queries/clientnegative/input_part0_neg.q
index 14f947c..5a80a26 100644
--- a/ql/src/test/queries/clientnegative/input_part0_neg.q
+++ b/ql/src/test/queries/clientnegative/input_part0_neg.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false; 
 
 set hive.mapred.mode=strict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/input_part0_neg_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/input_part0_neg_2.q b/ql/src/test/queries/clientnegative/input_part0_neg_2.q
index 9170744..4e192bc 100644
--- a/ql/src/test/queries/clientnegative/input_part0_neg_2.q
+++ b/ql/src/test/queries/clientnegative/input_part0_neg_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false; 
 
 reset hive.mapred.mode;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into1.q b/ql/src/test/queries/clientnegative/insert_into1.q
index 8c19767..e667b10 100644
--- a/ql/src/test/queries/clientnegative/insert_into1.q
+++ b/ql/src/test/queries/clientnegative/insert_into1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.lock.numretries=5;
 set hive.lock.sleep.between.retries=5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into2.q b/ql/src/test/queries/clientnegative/insert_into2.q
index 73a3b6f..8735401 100644
--- a/ql/src/test/queries/clientnegative/insert_into2.q
+++ b/ql/src/test/queries/clientnegative/insert_into2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.lock.numretries=5;
 set hive.lock.sleep.between.retries=5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into3.q b/ql/src/test/queries/clientnegative/insert_into3.q
index 4d048b3..0907cdd 100644
--- a/ql/src/test/queries/clientnegative/insert_into3.q
+++ b/ql/src/test/queries/clientnegative/insert_into3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.lock.numretries=5;
 set hive.lock.sleep.between.retries=5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into4.q b/ql/src/test/queries/clientnegative/insert_into4.q
index b8944e7..134ca7b 100644
--- a/ql/src/test/queries/clientnegative/insert_into4.q
+++ b/ql/src/test/queries/clientnegative/insert_into4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.lock.numretries=5;
 set hive.lock.sleep.between.retries=5;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into5.q b/ql/src/test/queries/clientnegative/insert_into5.q
index c20c168..695e1df 100644
--- a/ql/src/test/queries/clientnegative/insert_into5.q
+++ b/ql/src/test/queries/clientnegative/insert_into5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE if exists insert_into5_neg;
 
 CREATE TABLE insert_into5_neg (key int, value string) TBLPROPERTIES ("immutable"="true");

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_into6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_into6.q b/ql/src/test/queries/clientnegative/insert_into6.q
index 588cf86..49cee7c 100644
--- a/ql/src/test/queries/clientnegative/insert_into6.q
+++ b/ql/src/test/queries/clientnegative/insert_into6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 DROP TABLE IF EXISTS insert_into6_neg;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_multi_into_notnull.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_multi_into_notnull.q b/ql/src/test/queries/clientnegative/insert_multi_into_notnull.q
index 2c4ec1e..7206ede 100644
--- a/ql/src/test/queries/clientnegative/insert_multi_into_notnull.q
+++ b/ql/src/test/queries/clientnegative/insert_multi_into_notnull.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table src_multi1 (a STRING NOT NULL ENFORCED, b STRING);
 create table src_multi2 (i STRING, j STRING NOT NULL ENFORCED);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insert_view_failure.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insert_view_failure.q b/ql/src/test/queries/clientnegative/insert_view_failure.q
index 1f5e139..52d5863 100644
--- a/ql/src/test/queries/clientnegative/insert_view_failure.q
+++ b/ql/src/test/queries/clientnegative/insert_view_failure.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP VIEW xxx2;
 CREATE VIEW xxx2 AS SELECT * FROM src;
 INSERT OVERWRITE TABLE xxx2

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insertexternal1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insertexternal1.q b/ql/src/test/queries/clientnegative/insertexternal1.q
index 01ebae1..6650c08 100644
--- a/ql/src/test/queries/clientnegative/insertexternal1.q
+++ b/ql/src/test/queries/clientnegative/insertexternal1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.insert.into.external.tables=false;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q b/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
index 01fdb87..9743fee 100644
--- a/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
+++ b/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false;
 
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/insertsel_fail.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/insertsel_fail.q b/ql/src/test/queries/clientnegative/insertsel_fail.q
index c14fefd..b5d8ecf 100644
--- a/ql/src/test/queries/clientnegative/insertsel_fail.q
+++ b/ql/src/test/queries/clientnegative/insertsel_fail.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 insert overwrite directory 'target/warehouse/aret.out' select a.key src a;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/interval_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/interval_1.q b/ql/src/test/queries/clientnegative/interval_1.q
index 0db864d..6da3ad2 100644
--- a/ql/src/test/queries/clientnegative/interval_1.q
+++ b/ql/src/test/queries/clientnegative/interval_1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- year-month/day-time intervals not compatible
 select interval_day_time(interval '1' year) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/interval_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/interval_2.q b/ql/src/test/queries/clientnegative/interval_2.q
index 0af08ac..1eff403 100644
--- a/ql/src/test/queries/clientnegative/interval_2.q
+++ b/ql/src/test/queries/clientnegative/interval_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- year-month/day-time intervals not compatible
 select interval '1' year - interval '365' day from src limit 1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/interval_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/interval_3.q b/ql/src/test/queries/clientnegative/interval_3.q
index 1e2252f..8cd3070 100644
--- a/ql/src/test/queries/clientnegative/interval_3.q
+++ b/ql/src/test/queries/clientnegative/interval_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- year-month/day-time intervals not compatible
 select interval '1' year + interval '365' day from src limit 1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_avg_syntax.q b/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
index d5b58e0..15cbf66 100644
--- a/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT avg(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
index 00cd98e..317e081 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast (2 as binary) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
index f31344f..116776d 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(cast (2 as smallint) as binary) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
index af23d29..5797773 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(cast (2 as tinyint) as binary)  from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
index 91abe1e..0decaad 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(cast (2 as bigint) as binary) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
index afd99be..b4087b6 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(cast (2 as float) as binary)  from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
index c2143c5..22f51f5 100644
--- a/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
+++ b/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(cast (2 as double) as binary)  from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_char_length_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_char_length_2.q b/ql/src/test/queries/clientnegative/invalid_char_length_2.q
index 866b43d..bdeae7b 100644
--- a/ql/src/test/queries/clientnegative/invalid_char_length_2.q
+++ b/ql/src/test/queries/clientnegative/invalid_char_length_2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(value as char(100000)) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_distinct1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_distinct1.q b/ql/src/test/queries/clientnegative/invalid_distinct1.q
index 6f688e3..07ae6c0 100644
--- a/ql/src/test/queries/clientnegative/invalid_distinct1.q
+++ b/ql/src/test/queries/clientnegative/invalid_distinct1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 explain select hash(distinct value) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_distinct2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_distinct2.q b/ql/src/test/queries/clientnegative/invalid_distinct2.q
index b01218e..0305d62 100644
--- a/ql/src/test/queries/clientnegative/invalid_distinct2.q
+++ b/ql/src/test/queries/clientnegative/invalid_distinct2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 explain select explode(distinct value) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_distinct3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_distinct3.q b/ql/src/test/queries/clientnegative/invalid_distinct3.q
index e05acca..a93c666 100644
--- a/ql/src/test/queries/clientnegative/invalid_distinct3.q
+++ b/ql/src/test/queries/clientnegative/invalid_distinct3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 explain select hash(upper(distinct value)) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_mapjoin1.q b/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
index a6efd44..3a3f81c 100644
--- a/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
+++ b/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 select /*+ MAPJOIN(a) ,MAPJOIN(b)*/ * from src a join src b on (a.key=b.key and a.value=b.value);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_max_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_max_syntax.q b/ql/src/test/queries/clientnegative/invalid_max_syntax.q
index 2003373..e404969 100644
--- a/ql/src/test/queries/clientnegative/invalid_max_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_max_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT max(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_min_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_min_syntax.q b/ql/src/test/queries/clientnegative/invalid_min_syntax.q
index 584283a..07f4ce6 100644
--- a/ql/src/test/queries/clientnegative/invalid_min_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_min_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT min(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_select_fn.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_select_fn.q b/ql/src/test/queries/clientnegative/invalid_select_fn.q
index b01d29b..1c5064e 100644
--- a/ql/src/test/queries/clientnegative/invalid_select_fn.q
+++ b/ql/src/test/queries/clientnegative/invalid_select_fn.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 explain create table src_invalid as select average(key) as key_avg from src group by value;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_std_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_std_syntax.q b/ql/src/test/queries/clientnegative/invalid_std_syntax.q
index 1310419..90a6309 100644
--- a/ql/src/test/queries/clientnegative/invalid_std_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_std_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT std(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q b/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
index c6a1252..ad5c2af 100644
--- a/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT stddev_samp(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_sum_syntax.q b/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
index 2d591ba..b211561 100644
--- a/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT sum(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_t_transform.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_t_transform.q b/ql/src/test/queries/clientnegative/invalid_t_transform.q
index dfc4864..395dfff 100644
--- a/ql/src/test/queries/clientnegative/invalid_t_transform.q
+++ b/ql/src/test/queries/clientnegative/invalid_t_transform.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT TRANSFORM(*) USING 'cat' AS (key DATETIME) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q b/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
index ce2a8c4..3a6e826 100644
--- a/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT var_samp(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q b/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
index 3c199d3..c2f76e7 100644
--- a/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
+++ b/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select cast(value as varchar(100000)) from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/invalid_variance_syntax.q b/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
index 5b47829..80f5f9e 100644
--- a/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
+++ b/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT variance(*) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join2.q b/ql/src/test/queries/clientnegative/join2.q
index aad29c7..71d9c3c 100644
--- a/ql/src/test/queries/clientnegative/join2.q
+++ b/ql/src/test/queries/clientnegative/join2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.cbo.enable=false;
 SELECT /*+ MAPJOIN(x) */ x.key, x.value, y.value
 FROM src1 x LEFT OUTER JOIN src y ON (x.key = y.key);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join28.q b/ql/src/test/queries/clientnegative/join28.q
index a3fbb4e..0ffdd56 100644
--- a/ql/src/test/queries/clientnegative/join28.q
+++ b/ql/src/test/queries/clientnegative/join28.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE;
 set hive.cbo.enable=false;
 -- Mapjoin followed by mapjoin is not supported.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join29.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join29.q b/ql/src/test/queries/clientnegative/join29.q
index 72aa1ad..fd47a11 100644
--- a/ql/src/test/queries/clientnegative/join29.q
+++ b/ql/src/test/queries/clientnegative/join29.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT);
 set hive.cbo.enable=false;
 -- Mapjoin followed by group by is not supported.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join32.q b/ql/src/test/queries/clientnegative/join32.q
index f0547ec..8c93914 100644
--- a/ql/src/test/queries/clientnegative/join32.q
+++ b/ql/src/test/queries/clientnegative/join32.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.cbo.enable=false;
 CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join35.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join35.q b/ql/src/test/queries/clientnegative/join35.q
index bd9e8bb..252f66b 100644
--- a/ql/src/test/queries/clientnegative/join35.q
+++ b/ql/src/test/queries/clientnegative/join35.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE;
 set hive.cbo.enable=false;
 -- Mapjoin followed by union is not supported.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q b/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
index e39a38e..2178268 100644
--- a/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
+++ b/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain select *
 from src s1 , 
 src s2 on s1.key = s2.key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
index 0c58f58..5e10c6d 100644
--- a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
+++ b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
index 3db7aa6..3b5c6cd 100644
--- a/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
+++ b/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 explain select s1.key, s2.key

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/joinneg.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/joinneg.q b/ql/src/test/queries/clientnegative/joinneg.q
index a4967fd..9f965b4 100644
--- a/ql/src/test/queries/clientnegative/joinneg.q
+++ b/ql/src/test/queries/clientnegative/joinneg.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN FROM 
 (SELECT src.* FROM src) x
 JOIN 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lateral_view_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lateral_view_alias.q b/ql/src/test/queries/clientnegative/lateral_view_alias.q
index 50d535e..3b44d43 100644
--- a/ql/src/test/queries/clientnegative/lateral_view_alias.q
+++ b/ql/src/test/queries/clientnegative/lateral_view_alias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Check alias count for LATERAL VIEW syntax:
 -- explode returns a table with only 1 col - should be an error if query specifies >1 col aliases
 SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol1, myCol2 LIMIT 3;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lateral_view_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lateral_view_join.q b/ql/src/test/queries/clientnegative/lateral_view_join.q
index 818754e..e33663e 100644
--- a/ql/src/test/queries/clientnegative/lateral_view_join.q
+++ b/ql/src/test/queries/clientnegative/lateral_view_join.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT src.key FROM src LATERAL VIEW explode(array(1,2,3)) AS myTable JOIN src b ON src.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/load_view_failure.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/load_view_failure.q b/ql/src/test/queries/clientnegative/load_view_failure.q
index 64182ea..7c43541 100644
--- a/ql/src/test/queries/clientnegative/load_view_failure.q
+++ b/ql/src/test/queries/clientnegative/load_view_failure.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP VIEW xxx11;
 CREATE VIEW xxx11 AS SELECT * FROM src;
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE xxx11;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/local_mapred_error_cache.q b/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
index ed9e21d..8ee1358 100644
--- a/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
+++ b/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.mode.local.auto=true;
 set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateLocalErrorsHook;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg1.q b/ql/src/test/queries/clientnegative/lockneg1.q
index e1b58fc..90a23c4 100644
--- a/ql/src/test/queries/clientnegative/lockneg1.q
+++ b/ql/src/test/queries/clientnegative/lockneg1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table tstsrc;
 create table tstsrc like src;
 insert overwrite table tstsrc select key, value from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg2.q b/ql/src/test/queries/clientnegative/lockneg2.q
index a4604cd..e073b62 100644
--- a/ql/src/test/queries/clientnegative/lockneg2.q
+++ b/ql/src/test/queries/clientnegative/lockneg2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table tstsrc;
 create table tstsrc like src;
 insert overwrite table tstsrc select key, value from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg3.q b/ql/src/test/queries/clientnegative/lockneg3.q
index f2252f7..a606d62 100644
--- a/ql/src/test/queries/clientnegative/lockneg3.q
+++ b/ql/src/test/queries/clientnegative/lockneg3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 drop table tstsrcpart;
 create table tstsrcpart like srcpart;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg4.q b/ql/src/test/queries/clientnegative/lockneg4.q
index b47644c..021832b 100644
--- a/ql/src/test/queries/clientnegative/lockneg4.q
+++ b/ql/src/test/queries/clientnegative/lockneg4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 drop table tstsrcpart;
 create table tstsrcpart like srcpart;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q b/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
index 6ccdae3..b68e712 100644
--- a/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
+++ b/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.compute.query.using.stats=false;
 create database lockneg1;
 use lockneg1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q b/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
index 85bd425..cbb1e83 100644
--- a/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
+++ b/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.lock.numretries=0;
 
 create database lockneg2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q b/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
index 76c7ae9..3d66bc2 100644
--- a/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
+++ b/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.mode.local.auto=false;
 set hive.exec.job.debug.capture.stacktraces=true;
 set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q b/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
index c93aedb..5d00ef9 100644
--- a/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
+++ b/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.mode.local.auto=false;
 set hive.exec.job.debug.capture.stacktraces=false;
 set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/merge_negative_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/merge_negative_2.q b/ql/src/test/queries/clientnegative/merge_negative_2.q
index a4fab1c..2c31e8c 100644
--- a/ql/src/test/queries/clientnegative/merge_negative_2.q
+++ b/ql/src/test/queries/clientnegative/merge_negative_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table srcpart2 (key int, value string) partitioned by (ds string);
 insert overwrite table srcpart2 partition (ds='2011') select * from src;
 alter table srcpart2 concatenate;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/merge_negative_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/merge_negative_3.q b/ql/src/test/queries/clientnegative/merge_negative_3.q
index f5eb231..1664b9c 100644
--- a/ql/src/test/queries/clientnegative/merge_negative_3.q
+++ b/ql/src/test/queries/clientnegative/merge_negative_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/merge_negative_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/merge_negative_4.q b/ql/src/test/queries/clientnegative/merge_negative_4.q
index c2b9254..07b6d14 100644
--- a/ql/src/test/queries/clientnegative/merge_negative_4.q
+++ b/ql/src/test/queries/clientnegative/merge_negative_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/merge_negative_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/merge_negative_5.q b/ql/src/test/queries/clientnegative/merge_negative_5.q
index 8039676..93d00a0 100644
--- a/ql/src/test/queries/clientnegative/merge_negative_5.q
+++ b/ql/src/test/queries/clientnegative/merge_negative_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/minimr_broken_pipe.q b/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
index 8dda9cd..4960089 100644
--- a/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
+++ b/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 set hive.exec.script.allow.partial.consumption = false;
 -- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/mismatch_columns_insertion.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mismatch_columns_insertion.q b/ql/src/test/queries/clientnegative/mismatch_columns_insertion.q
index dad1ec1..046a771 100644
--- a/ql/src/test/queries/clientnegative/mismatch_columns_insertion.q
+++ b/ql/src/test/queries/clientnegative/mismatch_columns_insertion.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 
 create table mismatch_columns(key string, value string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/mm_concatenate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/mm_concatenate.q b/ql/src/test/queries/clientnegative/mm_concatenate.q
index 4b13c60..c825258 100644
--- a/ql/src/test/queries/clientnegative/mm_concatenate.q
+++ b/ql/src/test/queries/clientnegative/mm_concatenate.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/no_matching_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/no_matching_udf.q b/ql/src/test/queries/clientnegative/no_matching_udf.q
index 0c24b16..6cbac9e 100644
--- a/ql/src/test/queries/clientnegative/no_matching_udf.q
+++ b/ql/src/test/queries/clientnegative/no_matching_udf.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT percentile(3.5, 0.99) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/nonkey_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/nonkey_groupby.q b/ql/src/test/queries/clientnegative/nonkey_groupby.q
index 431e04e..d887282 100644
--- a/ql/src/test/queries/clientnegative/nonkey_groupby.q
+++ b/ql/src/test/queries/clientnegative/nonkey_groupby.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 EXPLAIN SELECT key, count(1) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/nopart_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/nopart_insert.q b/ql/src/test/queries/clientnegative/nopart_insert.q
index 6669bf6..d44ae11 100644
--- a/ql/src/test/queries/clientnegative/nopart_insert.q
+++ b/ql/src/test/queries/clientnegative/nopart_insert.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 CREATE TABLE nopart_insert(a STRING, b STRING) PARTITIONED BY (ds STRING);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/notable_alias4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/notable_alias4.q b/ql/src/test/queries/clientnegative/notable_alias4.q
index e7ad6b7..155e2aa 100644
--- a/ql/src/test/queries/clientnegative/notable_alias4.q
+++ b/ql/src/test/queries/clientnegative/notable_alias4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 EXPLAIN
 SELECT key from src JOIN src1 on src1.key=src.key;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/orderby_invalid_position.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/orderby_invalid_position.q b/ql/src/test/queries/clientnegative/orderby_invalid_position.q
index 4dbf2a6..87015a4 100644
--- a/ql/src/test/queries/clientnegative/orderby_invalid_position.q
+++ b/ql/src/test/queries/clientnegative/orderby_invalid_position.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.groupby.orderby.position.alias=true;
 
 -- invalid position alias in order by

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/orderby_position_unsupported.q b/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
index 01e897d..8ad824e 100644
--- a/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
+++ b/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.groupby.orderby.position.alias=true;
 
 SELECT src.* FROM src ORDER BY 3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/orderbysortby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/orderbysortby.q b/ql/src/test/queries/clientnegative/orderbysortby.q
index 5dff69f..a876561 100644
--- a/ql/src/test/queries/clientnegative/orderbysortby.q
+++ b/ql/src/test/queries/clientnegative/orderbysortby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
 
 FROM src

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q b/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
index acaae78..bc0daf6 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testAggrFuncsWithNoGBYNoPartDef
 select p_mfgr, 
 sum(p_retailprice) as s1  

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q b/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
index 5128576..3458401 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testAmbiguousWindowDefn
 select p_mfgr, p_name, p_size, 
 sum(p_size) over (w1) as s1, 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q b/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
index 2536e1e..0a86abb 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testPartitonBySortBy
 select p_mfgr, p_name, p_size,
 sum(p_retailprice) over (distribute by p_mfgr order by p_mfgr) as s1

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q b/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
index c863130..f8b1373 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testDuplicateWindowAlias
 select p_mfgr, p_name, p_size, 
 sum(p_size) over (w1) as s1, 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q b/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
index d9378d2..abe0bac 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testHavingLeadWithNoGBYNoWindowing
 select  p_mfgr,p_name, p_size 
 from part 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q b/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
index 93f72dc..7f32401 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testHavingLeadWithPTF
 select  p_mfgr,p_name, p_size 
 from noop(on part 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q b/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
index 91be988..5443554 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 -- testInvalidValueBoundary
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q b/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
index 66305a8..0850336 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testJoinWithAmbigousAlias
 select abc.* 
 from noop(on part

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_NoWindowDefn.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_NoWindowDefn.q b/ql/src/test/queries/clientnegative/ptf_negative_NoWindowDefn.q
index 99932cd..214b143 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_NoWindowDefn.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_NoWindowDefn.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testNoWindowDefn
 select p_mfgr, p_name, p_size,
 sum(p_size) over (w1) as s1,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q b/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
index 647a319..334e2c6 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testPartitonBySortBy
 select p_mfgr, p_name, p_size,
 sum(p_retailprice) over (partition by p_mfgr sort by p_mfgr) as s1

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q b/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
index 2c52383..47583a8 100644
--- a/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
+++ b/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- testWhereWithRankCond
 select  p_mfgr,p_name, p_size, 
 rank() over() as r 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_window_boundaries.q b/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
index c2fc041..33760da 100644
--- a/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
+++ b/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select p_mfgr, p_name, p_size,
     sum(p_retailprice) over (rows unbounded following) as s1 
      from part distribute by p_mfgr sort by p_name;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q b/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
index 873eda8..6e96a67 100644
--- a/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
+++ b/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select p_mfgr, p_name, p_size,
     sum(p_retailprice) over (range unbounded following) as s1
      from part distribute by p_mfgr sort by p_name;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/regex_col_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/regex_col_1.q b/ql/src/test/queries/clientnegative/regex_col_1.q
index a171961..181abc9 100644
--- a/ql/src/test/queries/clientnegative/regex_col_1.q
+++ b/ql/src/test/queries/clientnegative/regex_col_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.support.quoted.identifiers=none;
 EXPLAIN
 SELECT `+++` FROM srcpart;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/regex_col_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/regex_col_2.q b/ql/src/test/queries/clientnegative/regex_col_2.q
index 7bac1c7..18993f5 100644
--- a/ql/src/test/queries/clientnegative/regex_col_2.q
+++ b/ql/src/test/queries/clientnegative/regex_col_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.support.quoted.identifiers=none;
 EXPLAIN
 SELECT `.a.` FROM srcpart;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/regex_col_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/regex_col_groupby.q b/ql/src/test/queries/clientnegative/regex_col_groupby.q
index 300d145..afb0a18 100644
--- a/ql/src/test/queries/clientnegative/regex_col_groupby.q
+++ b/ql/src/test/queries/clientnegative/regex_col_groupby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.support.quoted.identifiers=none;
 EXPLAIN
 SELECT `..`, count(1) FROM srcpart GROUP BY `..`;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/right_side_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/right_side_join.q b/ql/src/test/queries/clientnegative/right_side_join.q
index 78771c8..6450c3a 100644
--- a/ql/src/test/queries/clientnegative/right_side_join.q
+++ b/ql/src/test/queries/clientnegative/right_side_join.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.cbo.enable=false;
 
 explain  

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/sample.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/sample.q b/ql/src/test/queries/clientnegative/sample.q
index 0086352..7f51f0b 100644
--- a/ql/src/test/queries/clientnegative/sample.q
+++ b/ql/src/test/queries/clientnegative/sample.q
@@ -1 +1,2 @@
+--! qt:dataset:srcbucket
 explain extended SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 5 OUT OF 4 on key) s
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/script_broken_pipe2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/script_broken_pipe2.q b/ql/src/test/queries/clientnegative/script_broken_pipe2.q
index 1c3093c..52b6b3c 100644
--- a/ql/src/test/queries/clientnegative/script_broken_pipe2.q
+++ b/ql/src/test/queries/clientnegative/script_broken_pipe2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.script.allow.partial.consumption = false;
 -- Tests exception in ScriptOperator.processOp() by passing extra data needed to fill pipe buffer
 SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value) USING 'true' as a,b,c,d FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/script_broken_pipe3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/script_broken_pipe3.q b/ql/src/test/queries/clientnegative/script_broken_pipe3.q
index 60f93d2..9aac02e 100644
--- a/ql/src/test/queries/clientnegative/script_broken_pipe3.q
+++ b/ql/src/test/queries/clientnegative/script_broken_pipe3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.script.allow.partial.consumption = true;
 -- Test to ensure that a script with a bad error code still fails even with partial consumption
 SELECT TRANSFORM(*) USING 'false' AS a, b FROM (SELECT TRANSFORM(*) USING 'echo' AS a, b FROM src LIMIT 1) tmp;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/script_error.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/script_error.q b/ql/src/test/queries/clientnegative/script_error.q
index 8ca849b..557195c 100644
--- a/ql/src/test/queries/clientnegative/script_error.q
+++ b/ql/src/test/queries/clientnegative/script_error.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' AS (tkey, tvalue)
 FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/selectDistinctStarNeg_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/selectDistinctStarNeg_1.q b/ql/src/test/queries/clientnegative/selectDistinctStarNeg_1.q
index 63647d8..68bf661 100644
--- a/ql/src/test/queries/clientnegative/selectDistinctStarNeg_1.q
+++ b/ql/src/test/queries/clientnegative/selectDistinctStarNeg_1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 -- Duplicate column name: key
 
 drop view if exists v;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/selectDistinctStarNeg_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/selectDistinctStarNeg_2.q b/ql/src/test/queries/clientnegative/selectDistinctStarNeg_2.q
index b38f065..cf0ac4b 100644
--- a/ql/src/test/queries/clientnegative/selectDistinctStarNeg_2.q
+++ b/ql/src/test/queries/clientnegative/selectDistinctStarNeg_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SELECT DISTINCT and GROUP BY can not be in the same query. Error encountered near token ‘key’
 
 select distinct * from src group by key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/selectDistinctWithoutAggr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/selectDistinctWithoutAggr.q b/ql/src/test/queries/clientnegative/selectDistinctWithoutAggr.q
index d031513..d17b71b 100644
--- a/ql/src/test/queries/clientnegative/selectDistinctWithoutAggr.q
+++ b/ql/src/test/queries/clientnegative/selectDistinctWithoutAggr.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Distinct without an aggregation is unsupported
 
 select hash(distinct key) from src;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/select_star_suffix.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/select_star_suffix.q b/ql/src/test/queries/clientnegative/select_star_suffix.q
index 6fbb8c5..142d020 100644
--- a/ql/src/test/queries/clientnegative/select_star_suffix.q
+++ b/ql/src/test/queries/clientnegative/select_star_suffix.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Check SELECT * syntax.
 -- Check that there should not be any identifier after STAR.
 select *abcdef from src;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/semijoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/semijoin1.q b/ql/src/test/queries/clientnegative/semijoin1.q
index 06e6cad..65040c1 100644
--- a/ql/src/test/queries/clientnegative/semijoin1.q
+++ b/ql/src/test/queries/clientnegative/semijoin1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- reference rhs of semijoin in select-clause
 select b.value from src a left semi join src b on (b.key = a.key and b.key = '100');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/semijoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/semijoin2.q b/ql/src/test/queries/clientnegative/semijoin2.q
index 46faae6..025f800 100644
--- a/ql/src/test/queries/clientnegative/semijoin2.q
+++ b/ql/src/test/queries/clientnegative/semijoin2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- rhs table reference in the where clause
 select a.value from src a left semi join src b on a.key = b.key where b.value = 'val_18';

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/semijoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/semijoin3.q b/ql/src/test/queries/clientnegative/semijoin3.q
index 35b455a..c8d4dbf 100644
--- a/ql/src/test/queries/clientnegative/semijoin3.q
+++ b/ql/src/test/queries/clientnegative/semijoin3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- rhs table reference in group by
 select * from src a left semi join src b on a.key = b.key group by b.value;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/semijoin4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/semijoin4.q b/ql/src/test/queries/clientnegative/semijoin4.q
index 4e52ebf..d244db7 100644
--- a/ql/src/test/queries/clientnegative/semijoin4.q
+++ b/ql/src/test/queries/clientnegative/semijoin4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- rhs table is a view and reference the view in where clause
 select a.value from src a left semi join (select key , value from src where key > 100) b on a.key = b.key where b.value = 'val_108' ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/semijoin5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/semijoin5.q b/ql/src/test/queries/clientnegative/semijoin5.q
index f805604..ba7f583 100644
--- a/ql/src/test/queries/clientnegative/semijoin5.q
+++ b/ql/src/test/queries/clientnegative/semijoin5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table t1 as select cast(key as int) key, value from src where key <= 10;
 
 create table t5 as select cast(key as int) key1, value value1 from src where key <= 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable0.q b/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable0.q
index b6393e4..6484f7f 100644
--- a/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable0.q
+++ b/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- should fail: for some internal variables which should not be settable via set command
 desc src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable1.q b/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable1.q
index 0038f36..84d92a5 100644
--- a/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable1.q
+++ b/ql/src/test/queries/clientnegative/set_hiveconf_internal_variable1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- should fail: hive.conf.internal.variable.list is in restricted list
 desc src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q b/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
index 4cb4866..e7cf827 100644
--- a/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
+++ b/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- should fail: hive.join.cache.size accepts int type
 desc src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q b/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
index 330aafd..c28306e 100644
--- a/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
+++ b/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- should fail: hive.map.aggr.hash.min.reduction accepts float type
 desc src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q b/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
index ad14c0c..cd7afd5 100644
--- a/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
+++ b/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- should fail: hive.fetch.task.conversion accepts none, minimal or more
 desc src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q b/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
index 242e165..92fd1f1 100644
--- a/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
+++ b/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
@@ -1 +1,2 @@
+--! qt:dataset:srcpart
 SHOW TABLE EXTENDED LIKE `srcpart` PARTITION(ds='2008-14-08', hr=11);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q b/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
index 1cd7066..8948b4a 100644
--- a/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
+++ b/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/smb_mapjoin_14.q b/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
index 58a406c..77f1cad 100644
--- a/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q b/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
index aac6983..50aff49 100644
--- a/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
+++ b/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table table_asc(key int, value string) CLUSTERED BY (key) SORTED BY (key asc) 
 INTO 1 BUCKETS STORED AS RCFILE; 
 create table table_desc(key int, value string) CLUSTERED BY (key) SORTED BY (key desc) 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/spark_job_max_tasks.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/spark_job_max_tasks.q b/ql/src/test/queries/clientnegative/spark_job_max_tasks.q
index a638f83..24a2fd7 100644
--- a/ql/src/test/queries/clientnegative/spark_job_max_tasks.q
+++ b/ql/src/test/queries/clientnegative/spark_job_max_tasks.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.spark.job.max.tasks=2;
 
 add file ../../data/scripts/sleep.py;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/spark_stage_max_tasks.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/spark_stage_max_tasks.q b/ql/src/test/queries/clientnegative/spark_stage_max_tasks.q
index fd43b67..31b11b6 100644
--- a/ql/src/test/queries/clientnegative/spark_stage_max_tasks.q
+++ b/ql/src/test/queries/clientnegative/spark_stage_max_tasks.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.spark.stage.max.tasks=1;
 
 add file ../../data/scripts/sleep.py;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/split_sample_out_of_range.q b/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
index 66af1fd..4e567dc 100644
--- a/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
+++ b/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
 
 select key from src tablesample(105 percent);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/split_sample_wrong_format.q b/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
index f71cc44..5e668a2 100644
--- a/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
+++ b/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 select key from src tablesample(1 percent);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q b/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
index 1a13c0f..496cba9 100644
--- a/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
+++ b/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 select key from src tablesample(1K);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q b/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
index 1b2872d..69918c9 100644
--- a/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
+++ b/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, there is a dummy stats aggregator which throws an error when the
 -- method connect is called (as indicated by the parameter hive.test.dummystats.aggregator)
 -- If stats need not be reliable, the statement succeeds. However, if stats are supposed

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q b/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
index 0fa9ff6..bdf24f8 100644
--- a/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
+++ b/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, the stats aggregator does not exists.
 -- If stats need not be reliable, the statement succeeds. However, if stats are supposed
 -- to be reliable (by setting hive.stats.reliable to true), the insert statement fails

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_publisher_error_1.q b/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
index be7c4f7..b02659a 100644
--- a/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
+++ b/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, there is a dummy stats publisher which throws an error when the
 -- method connect is called (as indicated by the parameter hive.test.dummystats.publisher)
 -- If stats need not be reliable, the statement succeeds. However, if stats are supposed

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/stats_publisher_error_2.q b/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
index 652afe7..2fa0d01 100644
--- a/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
+++ b/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, the stats publisher does not exists.
 -- If stats need not be reliable, the statement succeeds. However, if stats are supposed
 -- to be reliable (by setting hive.stats.reliable to true), the insert statement fails

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_join.q b/ql/src/test/queries/clientnegative/strict_join.q
index 66b5963..14cdfb3 100644
--- a/ql/src/test/queries/clientnegative/strict_join.q
+++ b/ql/src/test/queries/clientnegative/strict_join.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false; 
 
 set hive.mapred.mode=strict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_join_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_join_2.q b/ql/src/test/queries/clientnegative/strict_join_2.q
index dc5f87b..a9dd1a1 100644
--- a/ql/src/test/queries/clientnegative/strict_join_2.q
+++ b/ql/src/test/queries/clientnegative/strict_join_2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false; 
 
 reset hive.mapred.mode;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_orderby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_orderby.q b/ql/src/test/queries/clientnegative/strict_orderby.q
index 928b067..e94cb51 100644
--- a/ql/src/test/queries/clientnegative/strict_orderby.q
+++ b/ql/src/test/queries/clientnegative/strict_orderby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false; 
 
 set hive.mapred.mode=strict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_orderby_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_orderby_2.q b/ql/src/test/queries/clientnegative/strict_orderby_2.q
index 0a93af7..7dc0651 100644
--- a/ql/src/test/queries/clientnegative/strict_orderby_2.q
+++ b/ql/src/test/queries/clientnegative/strict_orderby_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 reset hive.mapred.mode;
 set hive.strict.checks.orderby.no.limit=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_pruning.q b/ql/src/test/queries/clientnegative/strict_pruning.q
index 834ee82..137fd7b 100644
--- a/ql/src/test/queries/clientnegative/strict_pruning.q
+++ b/ql/src/test/queries/clientnegative/strict_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.strict.checks.bucketing=false; 
 
 set hive.mapred.mode=strict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/strict_pruning_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/strict_pruning_2.q b/ql/src/test/queries/clientnegative/strict_pruning_2.q
index 718566d..3a11218 100644
--- a/ql/src/test/queries/clientnegative/strict_pruning_2.q
+++ b/ql/src/test/queries/clientnegative/strict_pruning_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 reset hive.mapred.mode;
 set hive.strict.checks.no.partition.filter=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subq_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subq_insert.q b/ql/src/test/queries/clientnegative/subq_insert.q
index 0bc9e24..1725e79 100644
--- a/ql/src/test/queries/clientnegative/subq_insert.q
+++ b/ql/src/test/queries/clientnegative/subq_insert.q
@@ -1,2 +1,4 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 EXPLAIN
 SELECT * FROM (INSERT OVERWRITE TABLE src1 SELECT * FROM src ) y;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_corr_from.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_corr_from.q b/ql/src/test/queries/clientnegative/subquery_corr_from.q
index 7df52c9..8fc0d92 100644
--- a/ql/src/test/queries/clientnegative/subquery_corr_from.q
+++ b/ql/src/test/queries/clientnegative/subquery_corr_from.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- corr var are only supported in where/having clause
 
 select * from part po where p_size IN (select p_size from (select p_size, p_type from part pp where pp.p_brand = po.p_brand) p where p.p_type=po.p_type) ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_corr_grandparent.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_corr_grandparent.q b/ql/src/test/queries/clientnegative/subquery_corr_grandparent.q
index 3519c5b..3938e7a 100644
--- a/ql/src/test/queries/clientnegative/subquery_corr_grandparent.q
+++ b/ql/src/test/queries/clientnegative/subquery_corr_grandparent.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- inner query can only refer to it's parent query columns
 select *
 from part x 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_corr_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_corr_select.q b/ql/src/test/queries/clientnegative/subquery_corr_select.q
index a47cee1..c4d5adf 100644
--- a/ql/src/test/queries/clientnegative/subquery_corr_select.q
+++ b/ql/src/test/queries/clientnegative/subquery_corr_select.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 -- correlated var is only allowed in where/having
 explain select * from part po where p_size IN (select po.p_size from part p where p.p_type=po.p_type) ;