http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_complex_types_multi_single_reducer.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/groupby_complex_types_multi_single_reducer.q
 
b/ql/src/test/queries/clientpositive/groupby_complex_types_multi_single_reducer.q
index 0a1f137..26236ab 100644
--- 
a/ql/src/test/queries/clientpositive/groupby_complex_types_multi_single_reducer.q
+++ 
b/ql/src/test/queries/clientpositive/groupby_complex_types_multi_single_reducer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.multigroupby.singlereducer=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_constcolval.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_constcolval.q 
b/ql/src/test/queries/clientpositive/groupby_constcolval.q
index e0ad694..a844258 100644
--- a/ql/src/test/queries/clientpositive/groupby_constcolval.q
+++ b/ql/src/test/queries/clientpositive/groupby_constcolval.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE IF EXISTS tlbtest;
 create table tlbtest (key int, key1 int, key2 int);
 select key, key1, key2 from (select a.key, 0 as key1 , 0 as key2 from tlbtest 
a inner join src b on a.key = b.key) a group by key, key1, key2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_cube_multi_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_cube_multi_gby.q 
b/ql/src/test/queries/clientpositive/groupby_cube_multi_gby.q
index dff81a4..b2a0dfa 100644
--- a/ql/src/test/queries/clientpositive/groupby_cube_multi_gby.q
+++ b/ql/src/test/queries/clientpositive/groupby_cube_multi_gby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.multigroupby.singlereducer=false;
 
 create table t1 like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q 
b/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
index 6a44dd1..7a40d01 100644
--- a/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
+++ b/ql/src/test/queries/clientpositive/groupby_distinct_samekey.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- This test covers HIVE-2332
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_duplicate_key.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_duplicate_key.q 
b/ql/src/test/queries/clientpositive/groupby_duplicate_key.q
index 1909873..72e38f4 100644
--- a/ql/src/test/queries/clientpositive/groupby_duplicate_key.q
+++ b/ql/src/test/queries/clientpositive/groupby_duplicate_key.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 select distinct key, "" as dummy1, "" as dummy2 from src tablesample (10 rows);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_grouping_window.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_window.q 
b/ql/src/test/queries/clientpositive/groupby_grouping_window.q
index 7ba73f9..8a5c290 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_window.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_window.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table t(category int, live int, comments int);
 insert into table t select key, 0, 2 from src tablesample(3 rows);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_join_pushdown.q 
b/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
index d0bf0fb..37ecd90 100644
--- a/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
+++ b/ql/src/test/queries/clientpositive/groupby_join_pushdown.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 set hive.transpose.aggr.join=true;
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_map_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_map_ppr.q 
b/ql/src/test/queries/clientpositive/groupby_map_ppr.q
index cec370f..d42416e 100644
--- a/ql/src/test/queries/clientpositive/groupby_map_ppr.q
+++ b/ql/src/test/queries/clientpositive/groupby_map_ppr.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q 
b/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
index 21ca124..5d96983 100644
--- a/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby_map_ppr_multi_distinct.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q 
b/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q
index c877814..1d6d8dc 100644
--- a/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby_multi_insert_common_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_multi_single_reducer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer.q 
b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer.q
index 40976ee..4f3d631 100644
--- a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer.q
+++ b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 -- due to L137 in LimitPushDownOptimization Not safe to continue for 
RS-GBY-GBY-LIM kind of pipelines. See HIVE-10607 for more.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q 
b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q
index 3c1b85f..5a5d149 100644
--- a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q
+++ b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.multigroupby.singlereducer=true;
 
 CREATE TABLE dest_g2(key STRING, c1 INT) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_multi_single_reducer3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer3.q 
b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer3.q
index 59a4698..224b67c 100644
--- a/ql/src/test/queries/clientpositive/groupby_multi_single_reducer3.q
+++ b/ql/src/test/queries/clientpositive/groupby_multi_single_reducer3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- HIVE-3849 Aliased column in where clause for multi-groupby single reducer 
cannot be resolved
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_neg_float.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_neg_float.q 
b/ql/src/test/queries/clientpositive/groupby_neg_float.q
index 0e41131..8a557e7 100644
--- a/ql/src/test/queries/clientpositive/groupby_neg_float.q
+++ b/ql/src/test/queries/clientpositive/groupby_neg_float.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 FROM src
 SELECT cast('-30.33' as DOUBLE)
 GROUP BY cast('-30.33' as DOUBLE)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_position.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_position.q 
b/ql/src/test/queries/clientpositive/groupby_position.q
index 446b99d..e691096 100644
--- a/ql/src/test/queries/clientpositive/groupby_position.q
+++ b/ql/src/test/queries/clientpositive/groupby_position.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.groupby.orderby.position.alias=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_ppr.q 
b/ql/src/test/queries/clientpositive/groupby_ppr.q
index 2f75afc..8cad28f 100644
--- a/ql/src/test/queries/clientpositive/groupby_ppr.q
+++ b/ql/src/test/queries/clientpositive/groupby_ppr.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q 
b/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
index 357ab95..a88d6ff 100644
--- a/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby_ppr_multi_distinct.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_resolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_resolution.q 
b/ql/src/test/queries/clientpositive/groupby_resolution.q
index 25a496e..7897453 100644
--- a/ql/src/test/queries/clientpositive/groupby_resolution.q
+++ b/ql/src/test/queries/clientpositive/groupby_resolution.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/clientpositive/groupby_sort_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_10.q 
b/ql/src/test/queries/clientpositive/groupby_sort_10.q
index 3517693..daf2db9 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_10.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_sort_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_11.q 
b/ql/src/test/queries/clientpositive/groupby_sort_11.q
index c56789d..015d91b 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_11.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.vectorized.execution.enabled=false;
 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/clientpositive/groupby_sort_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_5.q 
b/ql/src/test/queries/clientpositive/groupby_sort_5.q
index c7ff184..1fdd404 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_5.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_sort_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_sort_7.q 
b/ql/src/test/queries/clientpositive/groupby_sort_7.q
index 07b56a2..f0aea35 100644
--- a/ql/src/test/queries/clientpositive/groupby_sort_7.q
+++ b/ql/src/test/queries/clientpositive/groupby_sort_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max = 10;
 set hive.map.groupby.sorted=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/having.q 
b/ql/src/test/queries/clientpositive/having.q
index 52bf4ab..d23f2d0 100644
--- a/ql/src/test/queries/clientpositive/having.q
+++ b/ql/src/test/queries/clientpositive/having.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/having2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/having2.q 
b/ql/src/test/queries/clientpositive/having2.q
index 7b35365..6b34b68 100644
--- a/ql/src/test/queries/clientpositive/having2.q
+++ b/ql/src/test/queries/clientpositive/having2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 CREATE TABLE TestV1_Staples (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/hll.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hll.q 
b/ql/src/test/queries/clientpositive/hll.q
index 91c4e78..b6b67e2 100644
--- a/ql/src/test/queries/clientpositive/hll.q
+++ b/ql/src/test/queries/clientpositive/hll.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 create table n(key int);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/hook_order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hook_order.q 
b/ql/src/test/queries/clientpositive/hook_order.q
index 7602731..ac92b9b 100644
--- a/ql/src/test/queries/clientpositive/hook_order.q
+++ b/ql/src/test/queries/clientpositive/hook_order.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.query.reexecution.enabled=false;
 
 SET 
hive.exec.pre.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHooksRunInOrder$RunFirst,org.apache.hadoop.hive.ql.hooks.VerifyHooksRunInOrder$RunSecond;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q 
b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
index 8955b6a..30cf8c4 100644
--- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.stats.column.autogather=false;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q 
b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
index b9923f6..d989ca7 100644
--- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- Hybrid Grace Hash Join

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/identity_project_remove_skip.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/identity_project_remove_skip.q 
b/ql/src/test/queries/clientpositive/identity_project_remove_skip.q
index cbd2cc0..96917b0 100644
--- a/ql/src/test/queries/clientpositive/identity_project_remove_skip.q
+++ b/ql/src/test/queries/clientpositive/identity_project_remove_skip.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.remove.identity.project=true;
 set hive.auto.convert.join=true;
 set hive.optimize.ppd=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q 
b/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
index 808ad66..acec296 100644
--- a/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
+++ b/ql/src/test/queries/clientpositive/implicit_cast_during_insert.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table implicit_cast_during_insert (c1 int, c2 string)
   partitioned by (p1 string) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort.q
index 3423299..3978925 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
index 72682c5..0d4fced 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 
 
 set hive.exec.infer.bucket.sort=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
index e417028..10b5d4f 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_convert_join.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.stats.column.autogather=false;
 -- sounds weird:
 -- on master, when auto=true, hive.mapjoin.localtask.max.memory.usage will be 
0.55 as there is a gby

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
index e1a6ead..f3f22ae 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_grouping_operators.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q
index 64dd05d..5479468 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false; 
 set mapred.input.dir.recursive=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
index 1a778fa..782145b 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_map_operators.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
index f8cde4b..cf44041 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_merge.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_multi_insert.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_multi_insert.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_multi_insert.q
index 3341df0..73f7609 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_multi_insert.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_multi_insert.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.exec.infer.bucket.sort=true;
 set hive.exec.infer.bucket.sort.num.buckets.power.two=true;
 set hive.stats.dbclass=fs;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_num_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_bucket_sort_num_buckets.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_num_buckets.q
index 2255bdb..2383978 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_num_buckets.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_num_buckets.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.exec.infer.bucket.sort=true;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q 
b/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
index c0ddb8b..c017502 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_reducers_power_two.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.stats.column.autogather=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.infer.bucket.sort=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/infer_join_preds.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/infer_join_preds.q 
b/ql/src/test/queries/clientpositive/infer_join_preds.q
index c2e0d09..89827a2 100644
--- a/ql/src/test/queries/clientpositive/infer_join_preds.q
+++ b/ql/src/test/queries/clientpositive/infer_join_preds.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/innerjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/innerjoin.q 
b/ql/src/test/queries/clientpositive/innerjoin.q
index dd77ddd..9d38879 100644
--- a/ql/src/test/queries/clientpositive/innerjoin.q
+++ b/ql/src/test/queries/clientpositive/innerjoin.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input.q 
b/ql/src/test/queries/clientpositive/input.q
index 567d3b0..d7c4276 100644
--- a/ql/src/test/queries/clientpositive/input.q
+++ b/ql/src/test/queries/clientpositive/input.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT x.* FROM SRC x;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input0.q 
b/ql/src/test/queries/clientpositive/input0.q
index 63857c7..3cf9a37 100644
--- a/ql/src/test/queries/clientpositive/input0.q
+++ b/ql/src/test/queries/clientpositive/input0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT * FROM src; 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input11.q 
b/ql/src/test/queries/clientpositive/input11.q
index c831357..788e8e6 100644
--- a/ql/src/test/queries/clientpositive/input11.q
+++ b/ql/src/test/queries/clientpositive/input11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input11_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input11_limit.q 
b/ql/src/test/queries/clientpositive/input11_limit.q
index 211c37a..c5e5007 100644
--- a/ql/src/test/queries/clientpositive/input11_limit.q
+++ b/ql/src/test/queries/clientpositive/input11_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input12.q 
b/ql/src/test/queries/clientpositive/input12.q
index b4ec1f1..5b812ff 100644
--- a/ql/src/test/queries/clientpositive/input12.q
+++ b/ql/src/test/queries/clientpositive/input12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set mapreduce.framework.name=yarn;
 set mapreduce.jobtracker.address=localhost:58;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input12_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input12_hadoop20.q 
b/ql/src/test/queries/clientpositive/input12_hadoop20.q
index 17ee0a8..3c00101 100644
--- a/ql/src/test/queries/clientpositive/input12_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/input12_hadoop20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set mapred.job.tracker=localhost:58;
 set hive.exec.mode.local.auto=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input13.q 
b/ql/src/test/queries/clientpositive/input13.q
index 02be927..5f274f6 100644
--- a/ql/src/test/queries/clientpositive/input13.q
+++ b/ql/src/test/queries/clientpositive/input13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input14_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input14_limit.q 
b/ql/src/test/queries/clientpositive/input14_limit.q
index 2f6e4e4..fee94a3 100644
--- a/ql/src/test/queries/clientpositive/input14_limit.q
+++ b/ql/src/test/queries/clientpositive/input14_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input17.q 
b/ql/src/test/queries/clientpositive/input17.q
index d348c40..bd7cd02 100644
--- a/ql/src/test/queries/clientpositive/input17.q
+++ b/ql/src/test/queries/clientpositive/input17.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input18.q 
b/ql/src/test/queries/clientpositive/input18.q
index 280fb7b..3481f01 100644
--- a/ql/src/test/queries/clientpositive/input18.q
+++ b/ql/src/test/queries/clientpositive/input18.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input1_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input1_limit.q 
b/ql/src/test/queries/clientpositive/input1_limit.q
index afea986..384976a 100644
--- a/ql/src/test/queries/clientpositive/input1_limit.q
+++ b/ql/src/test/queries/clientpositive/input1_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input2.q 
b/ql/src/test/queries/clientpositive/input2.q
index 0069385..c7b0d30 100644
--- a/ql/src/test/queries/clientpositive/input2.q
+++ b/ql/src/test/queries/clientpositive/input2.q
@@ -3,10 +3,10 @@ DESCRIBE TEST2a;
 DESC TEST2a;
 CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS 
TEXTFILE;
 DESCRIBE TEST2b;
-SHOW TABLES;
+SHOW TABLES LIKE "TEST2*";
 DROP TABLE TEST2a;
-SHOW TABLES;
+SHOW TABLES LIKE "TEST2*";
 DROP TABLE TEST2b;
 
 EXPLAIN
-SHOW TABLES;
+SHOW TABLES LIKE "TEST2*";

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input20.q 
b/ql/src/test/queries/clientpositive/input20.q
index 3c2f78f..c443538 100644
--- a/ql/src/test/queries/clientpositive/input20.q
+++ b/ql/src/test/queries/clientpositive/input20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 ADD FILE ../../data/scripts/input20_script.py;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input23.q 
b/ql/src/test/queries/clientpositive/input23.q
index 9df92b0..b122821 100644
--- a/ql/src/test/queries/clientpositive/input23.q
+++ b/ql/src/test/queries/clientpositive/input23.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = 
'11' and b.ds = '2008-04-08' and b.hr = '14' limit 5;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input26.q 
b/ql/src/test/queries/clientpositive/input26.q
index 549ab21..79f5dbf 100644
--- a/ql/src/test/queries/clientpositive/input26.q
+++ b/ql/src/test/queries/clientpositive/input26.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 explain
 select * from (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input28.q 
b/ql/src/test/queries/clientpositive/input28.q
index 49479ed..edab7dd 100644
--- a/ql/src/test/queries/clientpositive/input28.q
+++ b/ql/src/test/queries/clientpositive/input28.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 create table tst(a string, b string) partitioned by (d string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input2_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input2_limit.q 
b/ql/src/test/queries/clientpositive/input2_limit.q
index a9a324d..b43d8ad 100644
--- a/ql/src/test/queries/clientpositive/input2_limit.q
+++ b/ql/src/test/queries/clientpositive/input2_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input3.q 
b/ql/src/test/queries/clientpositive/input3.q
index 1925fff..07d75bd 100644
--- a/ql/src/test/queries/clientpositive/input3.q
+++ b/ql/src/test/queries/clientpositive/input3.q
@@ -1,17 +1,17 @@
-CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE; 
-DESCRIBE TEST3a; 
-CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS 
TEXTFILE; 
-DESCRIBE TEST3b; 
-SHOW TABLES;
+CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE;
+DESCRIBE TEST3a;
+CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS 
TEXTFILE;
+DESCRIBE TEST3b;
+SHOW TABLES LIKE "TEST3*";
 EXPLAIN
 ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE);
 ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE);
-DESCRIBE TEST3b; 
+DESCRIBE TEST3b;
 EXPLAIN
 ALTER TABLE TEST3b RENAME TO TEST3c;
 ALTER TABLE TEST3b RENAME TO TEST3c;
-DESCRIBE TEST3c; 
-SHOW TABLES;
+DESCRIBE TEST3c;
+SHOW TABLES LIKE "TEST3*";
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 EXPLAIN
 ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input30.q 
b/ql/src/test/queries/clientpositive/input30.q
index 5da18d0..362c76a 100644
--- a/ql/src/test/queries/clientpositive/input30.q
+++ b/ql/src/test/queries/clientpositive/input30.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/clientpositive/input31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input31.q 
b/ql/src/test/queries/clientpositive/input31.q
index 56093eb..eb48166 100644
--- a/ql/src/test/queries/clientpositive/input31.q
+++ b/ql/src/test/queries/clientpositive/input31.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
 set hive.mapred.mode=nonstrict;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input32.q 
b/ql/src/test/queries/clientpositive/input32.q
index 6953caa..bbb3048 100644
--- a/ql/src/test/queries/clientpositive/input32.q
+++ b/ql/src/test/queries/clientpositive/input32.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input33.q 
b/ql/src/test/queries/clientpositive/input33.q
index 3309045..4398ebf 100644
--- a/ql/src/test/queries/clientpositive/input33.q
+++ b/ql/src/test/queries/clientpositive/input33.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 ADD FILE ../../data/scripts/input20_script.py;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input34.q 
b/ql/src/test/queries/clientpositive/input34.q
index c600bf5..06fe223 100644
--- a/ql/src/test/queries/clientpositive/input34.q
+++ b/ql/src/test/queries/clientpositive/input34.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input36.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input36.q 
b/ql/src/test/queries/clientpositive/input36.q
index fd1968f..6e97cb8 100644
--- a/ql/src/test/queries/clientpositive/input36.q
+++ b/ql/src/test/queries/clientpositive/input36.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input38.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input38.q 
b/ql/src/test/queries/clientpositive/input38.q
index 1ccc5f2..1639764 100644
--- a/ql/src/test/queries/clientpositive/input38.q
+++ b/ql/src/test/queries/clientpositive/input38.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input39.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input39.q 
b/ql/src/test/queries/clientpositive/input39.q
index 471736b..5dd8372 100644
--- a/ql/src/test/queries/clientpositive/input39.q
+++ b/ql/src/test/queries/clientpositive/input39.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S)
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input39_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input39_hadoop20.q 
b/ql/src/test/queries/clientpositive/input39_hadoop20.q
index 29e9fae..ad5207d 100644
--- a/ql/src/test/queries/clientpositive/input39_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/input39_hadoop20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input41.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input41.q 
b/ql/src/test/queries/clientpositive/input41.q
index 5bc396e..311a8e3 100644
--- a/ql/src/test/queries/clientpositive/input41.q
+++ b/ql/src/test/queries/clientpositive/input41.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=strict;
 
 create table dest_sp (cnt int);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input42.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input42.q 
b/ql/src/test/queries/clientpositive/input42.q
index a687450..58685f8 100644
--- a/ql/src/test/queries/clientpositive/input42.q
+++ b/ql/src/test/queries/clientpositive/input42.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input43.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input43.q 
b/ql/src/test/queries/clientpositive/input43.q
index 3182bbe..bea0c3f 100644
--- a/ql/src/test/queries/clientpositive/input43.q
+++ b/ql/src/test/queries/clientpositive/input43.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 drop table tst_src1;
 create table tst_src1 like src1;
 load data local inpath '../../data/files/kv1.txt' into table tst_src1 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input44.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input44.q 
b/ql/src/test/queries/clientpositive/input44.q
index 2e975e5..cd99ad0 100644
--- a/ql/src/test/queries/clientpositive/input44.q
+++ b/ql/src/test/queries/clientpositive/input44.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest(key INT, value STRING) STORED AS TEXTFILE;
 
 SET hive.output.file.extension=.txt;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input45.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input45.q 
b/ql/src/test/queries/clientpositive/input45.q
index 334da26..9d6d06b 100644
--- a/ql/src/test/queries/clientpositive/input45.q
+++ b/ql/src/test/queries/clientpositive/input45.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.insert.into.multilevel.dirs=true;
 
 SET hive.output.file.extension=.txt;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input46.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input46.q 
b/ql/src/test/queries/clientpositive/input46.q
index ab863dc..cb18390 100644
--- a/ql/src/test/queries/clientpositive/input46.q
+++ b/ql/src/test/queries/clientpositive/input46.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create database if not exists table_in_database_creation;
 create table table_in_database_creation.test1  as select * from src limit 1;
 create table `table_in_database_creation`.`test2` as select * from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input49.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input49.q 
b/ql/src/test/queries/clientpositive/input49.q
index 53fa51a..92e02a9 100644
--- a/ql/src/test/queries/clientpositive/input49.q
+++ b/ql/src/test/queries/clientpositive/input49.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table intable (b boolean, d double, f float, i int, l bigint, s string, 
t tinyint);
 insert overwrite table intable select 0, 29098519.0, 1410.0, 996, 40408519555, 
"test_string", 12 from src limit 1;
 select * from intable where d in (29098519.0) and f in (1410.0) and i in (996) 
and l in (40408519555) and s in ('test_string') and t in (12);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input4_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input4_limit.q 
b/ql/src/test/queries/clientpositive/input4_limit.q
index e6e3c46..ee8b52e 100644
--- a/ql/src/test/queries/clientpositive/input4_limit.q
+++ b/ql/src/test/queries/clientpositive/input4_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 select * from src sort by key limit 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input5.q 
b/ql/src/test/queries/clientpositive/input5.q
index 2af9163..8a2a34b 100644
--- a/ql/src/test/queries/clientpositive/input5.q
+++ b/ql/src/test/queries/clientpositive/input5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input6.q 
b/ql/src/test/queries/clientpositive/input6.q
index 4f2f17e..9d6ffc8 100644
--- a/ql/src/test/queries/clientpositive/input6.q
+++ b/ql/src/test/queries/clientpositive/input6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input7.q 
b/ql/src/test/queries/clientpositive/input7.q
index f2e1ed0..11ce7ea 100644
--- a/ql/src/test/queries/clientpositive/input7.q
+++ b/ql/src/test/queries/clientpositive/input7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 CREATE TABLE dest1(c1 DOUBLE, c2 INT) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input8.q 
b/ql/src/test/queries/clientpositive/input8.q
index cf24a55..14b0e99 100644
--- a/ql/src/test/queries/clientpositive/input8.q
+++ b/ql/src/test/queries/clientpositive/input8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 STRING, c2 INT, c3 DOUBLE) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input9.q 
b/ql/src/test/queries/clientpositive/input9.q
index ded20a8..5235098 100644
--- a/ql/src/test/queries/clientpositive/input9.q
+++ b/ql/src/test/queries/clientpositive/input9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 CREATE TABLE dest1(value STRING, key INT) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_columnarserde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_columnarserde.q 
b/ql/src/test/queries/clientpositive/input_columnarserde.q
index 9394382..b94b837 100644
--- a/ql/src/test/queries/clientpositive/input_columnarserde.q
+++ b/ql/src/test/queries/clientpositive/input_columnarserde.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 
 CREATE TABLE input_columnarserde(a array<int>, b array<string>, c 
map<string,string>, d int, e string)
 ROW FORMAT SERDE

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_dynamicserde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_dynamicserde.q 
b/ql/src/test/queries/clientpositive/input_dynamicserde.q
index 1437742..4c63a35 100644
--- a/ql/src/test/queries/clientpositive/input_dynamicserde.q
+++ b/ql/src/test/queries/clientpositive/input_dynamicserde.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 CREATE TABLE dest1(a array<int>, b array<string>, c map<string,string>, d int, 
e string)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '1'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_lazyserde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_lazyserde.q 
b/ql/src/test/queries/clientpositive/input_lazyserde.q
index c37e48b..f053fbe 100644
--- a/ql/src/test/queries/clientpositive/input_lazyserde.q
+++ b/ql/src/test/queries/clientpositive/input_lazyserde.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcbucket2
+--! qt:dataset:src_thrift
 -- Suppress vectorization due to known bug.  See HIVE-19088.
 set hive.vectorized.execution.enabled=false;
 set hive.test.vectorized.execution.enabled.override=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_lazyserde2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_lazyserde2.q 
b/ql/src/test/queries/clientpositive/input_lazyserde2.q
index 2a2cf06..a110106 100644
--- a/ql/src/test/queries/clientpositive/input_lazyserde2.q
+++ b/ql/src/test/queries/clientpositive/input_lazyserde2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcbucket2
+--! qt:dataset:src_thrift
 -- Suppress vectorization due to known bug.  See HIVE-19088.
 set hive.vectorized.execution.enabled=false;
 set hive.test.vectorized.execution.enabled.override=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_limit.q 
b/ql/src/test/queries/clientpositive/input_limit.q
index 6d4363e..c0a17eb 100644
--- a/ql/src/test/queries/clientpositive/input_limit.q
+++ b/ql/src/test/queries/clientpositive/input_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT x.* FROM SRC x LIMIT 20;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part0.q 
b/ql/src/test/queries/clientpositive/input_part0.q
index e5526e5..c5ac3f5 100644
--- a/ql/src/test/queries/clientpositive/input_part0.q
+++ b/ql/src/test/queries/clientpositive/input_part0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = '2008-04-08';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part1.q 
b/ql/src/test/queries/clientpositive/input_part1.q
index 0a3a3b4..4bfc85d 100644
--- a/ql/src/test/queries/clientpositive/input_part1.q
+++ b/ql/src/test/queries/clientpositive/input_part1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS 
TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part10.q 
b/ql/src/test/queries/clientpositive/input_part10.q
index e6d6c22..833f5f7 100644
--- a/ql/src/test/queries/clientpositive/input_part10.q
+++ b/ql/src/test/queries/clientpositive/input_part10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE part_special (
   a STRING,
   b STRING

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part2.q 
b/ql/src/test/queries/clientpositive/input_part2.q
index aff02e3..9df97a7 100644
--- a/ql/src/test/queries/clientpositive/input_part2.q
+++ b/ql/src/test/queries/clientpositive/input_part2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 CREATE TABLE dest1(key INT, value STRING, hr STRING, ds STRING) STORED AS 
TEXTFILE;
 CREATE TABLE dest2(key INT, value STRING, hr STRING, ds STRING) STORED AS 
TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part3.q 
b/ql/src/test/queries/clientpositive/input_part3.q
index ea1d2b2..b8e8149 100644
--- a/ql/src/test/queries/clientpositive/input_part3.q
+++ b/ql/src/test/queries/clientpositive/input_part3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = '2008-04-08' and x.hr = 11;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part4.q 
b/ql/src/test/queries/clientpositive/input_part4.q
index 7c2e0aa..c941469 100644
--- a/ql/src/test/queries/clientpositive/input_part4.q
+++ b/ql/src/test/queries/clientpositive/input_part4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = '2008-04-08' and x.hr = 15;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part5.q 
b/ql/src/test/queries/clientpositive/input_part5.q
index 029aa05..62d76cb 100644
--- a/ql/src/test/queries/clientpositive/input_part5.q
+++ b/ql/src/test/queries/clientpositive/input_part5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 
 create table tmptable(key string, value string, hr string, ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part6.q 
b/ql/src/test/queries/clientpositive/input_part6.q
index dd43a83..c2f805d 100644
--- a/ql/src/test/queries/clientpositive/input_part6.q
+++ b/ql/src/test/queries/clientpositive/input_part6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE x.ds = "2008-04-08" LIMIT 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part7.q 
b/ql/src/test/queries/clientpositive/input_part7.q
index 10f9336..9a53014 100644
--- a/ql/src/test/queries/clientpositive/input_part7.q
+++ b/ql/src/test/queries/clientpositive/input_part7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 EXPLAIN EXTENDED
 SELECT * FROM (
   SELECT X.* FROM SRCPART X WHERE X.ds = '2008-04-08' and X.key < 100

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part8.q 
b/ql/src/test/queries/clientpositive/input_part8.q
index 6f1c9ec..3f18331 100644
--- a/ql/src/test/queries/clientpositive/input_part8.q
+++ b/ql/src/test/queries/clientpositive/input_part8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 EXPLAIN
 SELECT x.* FROM SRCPART x WHERE ds = '2008-04-08' LIMIT 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_part9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_part9.q 
b/ql/src/test/queries/clientpositive/input_part9.q
index d48f990..a2a009a 100644
--- a/ql/src/test/queries/clientpositive/input_part9.q
+++ b/ql/src/test/queries/clientpositive/input_part9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_testsequencefile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_testsequencefile.q 
b/ql/src/test/queries/clientpositive/input_testsequencefile.q
index d992688..1e70cff 100755
--- a/ql/src/test/queries/clientpositive/input_testsequencefile.q
+++ b/ql/src/test/queries/clientpositive/input_testsequencefile.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set mapred.output.compress=true;
 set mapred.output.compression.type=BLOCK;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_testxpath.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_testxpath.q 
b/ql/src/test/queries/clientpositive/input_testxpath.q
index ed22404..368feb6 100755
--- a/ql/src/test/queries/clientpositive/input_testxpath.q
+++ b/ql/src/test/queries/clientpositive/input_testxpath.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 CREATE TABLE dest1(key INT, value STRING, mapvalue STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_testxpath2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_testxpath2.q 
b/ql/src/test/queries/clientpositive/input_testxpath2.q
index 131105b..7c7b1fe 100644
--- a/ql/src/test/queries/clientpositive/input_testxpath2.q
+++ b/ql/src/test/queries/clientpositive/input_testxpath2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 CREATE TABLE dest1(lint_size INT, lintstring_size INT, mstringstring_size INT) 
STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_testxpath3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_testxpath3.q 
b/ql/src/test/queries/clientpositive/input_testxpath3.q
index 1b57ead..c37eec3 100644
--- a/ql/src/test/queries/clientpositive/input_testxpath3.q
+++ b/ql/src/test/queries/clientpositive/input_testxpath3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 EXPLAIN
 FROM src_thrift
 SELECT src_thrift.mstringstring['key_9'], src_thrift.lintstring.myint;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/input_testxpath4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/input_testxpath4.q 
b/ql/src/test/queries/clientpositive/input_testxpath4.q
index e8e8d2e..b0d21fc 100644
--- a/ql/src/test/queries/clientpositive/input_testxpath4.q
+++ b/ql/src/test/queries/clientpositive/input_testxpath4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 set hive.optimize.ppd=false;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/inputwherefalse.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/inputwherefalse.q 
b/ql/src/test/queries/clientpositive/inputwherefalse.q
index 4605ac6..bf498ac 100644
--- a/ql/src/test/queries/clientpositive/inputwherefalse.q
+++ b/ql/src/test/queries/clientpositive/inputwherefalse.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 From (select * from src) a
 insert overwrite directory 'target/warehouse/destemp.out/dir1/'
 select key

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert0.q 
b/ql/src/test/queries/clientpositive/insert0.q
index 7e687ac..85f73a0 100644
--- a/ql/src/test/queries/clientpositive/insert0.q
+++ b/ql/src/test/queries/clientpositive/insert0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert1.q 
b/ql/src/test/queries/clientpositive/insert1.q
index 4117b54..91daf7e 100644
--- a/ql/src/test/queries/clientpositive/insert1.q
+++ b/ql/src/test/queries/clientpositive/insert1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert2.q 
b/ql/src/test/queries/clientpositive/insert2.q
index 669e4c3..272d7df 100644
--- a/ql/src/test/queries/clientpositive/insert2.q
+++ b/ql/src/test/queries/clientpositive/insert2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set fs.defaultFS=file:///;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q 
b/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
index 2025d53..f36294d 100644
--- a/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 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/clientpositive/insert_acid_not_bucketed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q 
b/ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q
index 9e61fd7..b4058d7 100644
--- a/ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q
+++ b/ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 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/clientpositive/insert_after_drop_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_after_drop_partition.q 
b/ql/src/test/queries/clientpositive/insert_after_drop_partition.q
index 0087560..a17d03d 100644
--- a/ql/src/test/queries/clientpositive/insert_after_drop_partition.q
+++ b/ql/src/test/queries/clientpositive/insert_after_drop_partition.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create external table insert_after_drop_partition(key string, val string) 
partitioned by (insertdate string);
 
 insert overwrite table insert_after_drop_partition partition 
(insertdate='2008-01-01') select * from src limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_compressed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_compressed.q 
b/ql/src/test/queries/clientpositive/insert_compressed.q
index 8f1201c..ebd0d36 100644
--- a/ql/src/test/queries/clientpositive/insert_compressed.q
+++ b/ql/src/test/queries/clientpositive/insert_compressed.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.compress.output=true;
 
 drop table insert_compressed;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_dir_distcp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_dir_distcp.q 
b/ql/src/test/queries/clientpositive/insert_dir_distcp.q
index 6582938..cea79a3 100644
--- a/ql/src/test/queries/clientpositive/insert_dir_distcp.q
+++ b/ql/src/test/queries/clientpositive/insert_dir_distcp.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.copyfile.maxsize=400;
 
 set tez.am.log.level=INFO;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into1.q 
b/ql/src/test/queries/clientpositive/insert_into1.q
index f00d06e..6aed53f 100644
--- a/ql/src/test/queries/clientpositive/insert_into1.q
+++ b/ql/src/test/queries/clientpositive/insert_into1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set hive.compute.query.using.stats=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into2.q 
b/ql/src/test/queries/clientpositive/insert_into2.q
index f3e49ff..10c72d8 100644
--- a/ql/src/test/queries/clientpositive/insert_into2.q
+++ b/ql/src/test/queries/clientpositive/insert_into2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.compute.query.using.stats=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into3.q 
b/ql/src/test/queries/clientpositive/insert_into3.q
index 4ff0edc..c152dd9 100644
--- a/ql/src/test/queries/clientpositive/insert_into3.q
+++ b/ql/src/test/queries/clientpositive/insert_into3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE insert_into3a;
 DROP TABLE insert_into3b;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into4.q 
b/ql/src/test/queries/clientpositive/insert_into4.q
index 2afe41d..176db9f 100644
--- a/ql/src/test/queries/clientpositive/insert_into4.q
+++ b/ql/src/test/queries/clientpositive/insert_into4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.merge.smallfiles.avgsize=16000000;
 
 DROP TABLE insert_into4a;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into5.q 
b/ql/src/test/queries/clientpositive/insert_into5.q
index 358fdf4..7b42429 100644
--- a/ql/src/test/queries/clientpositive/insert_into5.q
+++ b/ql/src/test/queries/clientpositive/insert_into5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 DROP TABLE insert_into5a;
 DROP TABLE insert_into5b;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_into6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_into6.q 
b/ql/src/test/queries/clientpositive/insert_into6.q
index 1e33c67..a22797d 100644
--- a/ql/src/test/queries/clientpositive/insert_into6.q
+++ b/ql/src/test/queries/clientpositive/insert_into6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_orig_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_orig_table.q 
b/ql/src/test/queries/clientpositive/insert_orig_table.q
index 544fe11..5d173e9 100644
--- a/ql/src/test/queries/clientpositive/insert_orig_table.q
+++ b/ql/src/test/queries/clientpositive/insert_orig_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_overwrite_directory.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_overwrite_directory.q 
b/ql/src/test/queries/clientpositive/insert_overwrite_directory.q
index 2efe41f..1180589 100644
--- a/ql/src/test/queries/clientpositive/insert_overwrite_directory.q
+++ b/ql/src/test/queries/clientpositive/insert_overwrite_directory.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 insert overwrite directory '../../data/files/src_table_1'
 select * from src ;
 dfs -cat ../../data/files/src_table_1/000000_0;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_overwrite_directory2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_overwrite_directory2.q 
b/ql/src/test/queries/clientpositive/insert_overwrite_directory2.q
index dd337a9..b58fb44 100644
--- a/ql/src/test/queries/clientpositive/insert_overwrite_directory2.q
+++ b/ql/src/test/queries/clientpositive/insert_overwrite_directory2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create external table result(key string) location 
"${system:test.tmp.dir}/result";
 
 set mapreduce.job.reduces=2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q 
b/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q
index 6d069f5..9fd8d15 100644
--- a/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q
+++ b/ql/src/test/queries/clientpositive/insert_overwrite_local_directory_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 insert overwrite local directory '../../data/files/local_src_table_1'
 select * from src ;
 dfs -cat ../../data/files/local_src_table_1/000000_0;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_update_delete.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_update_delete.q 
b/ql/src/test/queries/clientpositive/insert_update_delete.q
index fb00346..bd9f777 100644
--- a/ql/src/test/queries/clientpositive/insert_update_delete.q
+++ b/ql/src/test/queries/clientpositive/insert_update_delete.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 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/clientpositive/insert_values_orig_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insert_values_orig_table.q 
b/ql/src/test/queries/clientpositive/insert_values_orig_table.q
index 1319a0a..a0fce90 100644
--- a/ql/src/test/queries/clientpositive/insert_values_orig_table.q
+++ b/ql/src/test/queries/clientpositive/insert_values_orig_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insert_values_orig_table_use_metadata.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/insert_values_orig_table_use_metadata.q 
b/ql/src/test/queries/clientpositive/insert_values_orig_table_use_metadata.q
index 2f366fb..ff7c1a8 100644
--- a/ql/src/test/queries/clientpositive/insert_values_orig_table_use_metadata.q
+++ b/ql/src/test/queries/clientpositive/insert_values_orig_table_use_metadata.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/insertexternal1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/insertexternal1.q 
b/ql/src/test/queries/clientpositive/insertexternal1.q
index 9004a0c..2e938b0 100644
--- a/ql/src/test/queries/clientpositive/insertexternal1.q
+++ b/ql/src/test/queries/clientpositive/insertexternal1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 create table texternal(key string, val string) partitioned by (insertdate 
string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/intersect_all.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/intersect_all.q 
b/ql/src/test/queries/clientpositive/intersect_all.q
index a0d4afd..35033be 100644
--- a/ql/src/test/queries/clientpositive/intersect_all.q
+++ b/ql/src/test/queries/clientpositive/intersect_all.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/intersect_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/intersect_distinct.q 
b/ql/src/test/queries/clientpositive/intersect_distinct.q
index aa8155a..78b515d 100644
--- a/ql/src/test/queries/clientpositive/intersect_distinct.q
+++ b/ql/src/test/queries/clientpositive/intersect_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_1.q 
b/ql/src/test/queries/clientpositive/interval_1.q
index b3b586f..4e92923 100644
--- a/ql/src/test/queries/clientpositive/interval_1.q
+++ b/ql/src/test/queries/clientpositive/interval_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 select
   interval '10-11' year to month,
   interval '10' year,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_2.q 
b/ql/src/test/queries/clientpositive/interval_2.q
index f622c76..869c4e5 100644
--- a/ql/src/test/queries/clientpositive/interval_2.q
+++ b/ql/src/test/queries/clientpositive/interval_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- group-by/order-by/aggregation functions
 
 select

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_3.q 
b/ql/src/test/queries/clientpositive/interval_3.q
index 3b05448..ee0f83c 100644
--- a/ql/src/test/queries/clientpositive/interval_3.q
+++ b/ql/src/test/queries/clientpositive/interval_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 -- where clause
 select

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_arithmetic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_arithmetic.q 
b/ql/src/test/queries/clientpositive/interval_arithmetic.q
index ae14579..7261311 100644
--- a/ql/src/test/queries/clientpositive/interval_arithmetic.q
+++ b/ql/src/test/queries/clientpositive/interval_arithmetic.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 create table interval_arithmetic_1 (dateval date, tsval timestamp);
 insert overwrite table interval_arithmetic_1
   select cast(ctimestamp1 as date), ctimestamp1 from alltypesorc;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_comparison.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_comparison.q 
b/ql/src/test/queries/clientpositive/interval_comparison.q
index 8e78664..3d835b3 100644
--- a/ql/src/test/queries/clientpositive/interval_comparison.q
+++ b/ql/src/test/queries/clientpositive/interval_comparison.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 -- should all be true
 select

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/interval_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/interval_udf.q 
b/ql/src/test/queries/clientpositive/interval_udf.q
index 3fbdb0b..636a11e 100644
--- a/ql/src/test/queries/clientpositive/interval_udf.q
+++ b/ql/src/test/queries/clientpositive/interval_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 select
   year(iym), month(iym), day(idt), hour(idt), minute(idt), second(idt)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/is_distinct_from.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/is_distinct_from.q 
b/ql/src/test/queries/clientpositive/is_distinct_from.q
index b3d9d65..f135f4e 100644
--- a/ql/src/test/queries/clientpositive/is_distinct_from.q
+++ b/ql/src/test/queries/clientpositive/is_distinct_from.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 explain select 1 is distinct from 1,
                1 is distinct from 2,
                1 is distinct from null,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ivyDownload.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ivyDownload.q 
b/ql/src/test/queries/clientpositive/ivyDownload.q
index 2d3c25e..607781c 100644
--- a/ql/src/test/queries/clientpositive/ivyDownload.q
+++ b/ql/src/test/queries/clientpositive/ivyDownload.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 dfs -cp 
${system:hive.root}/contrib/target/hive-contrib-${system:hive.version}.jar 
${system:test.tmp.dir}/udfexampleadd-1.0.jar;
 
 ADD JAR ivy://:udfexampleadd:1.0;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/jdbc_handler.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/jdbc_handler.q 
b/ql/src/test/queries/clientpositive/jdbc_handler.q
index 7e21550..61e02a8 100644
--- a/ql/src/test/queries/clientpositive/jdbc_handler.q
+++ b/ql/src/test/queries/clientpositive/jdbc_handler.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 set hive.strict.checks.cartesian.product= false;
 CREATE EXTERNAL TABLE tables
@@ -27,7 +28,7 @@ TBLPROPERTIES (
 );
 
 select tables.name as tn, dbs.NAME as dn, tables.type as t
-from tables join dbs on (tables.db_id = dbs.DB_ID) order by tn, dn, t;
+from tables join dbs on (tables.db_id = dbs.DB_ID) WHERE tables.name IN 
("src", "dbs", "tables") order by tn, dn, t;
 
 explain
 select
@@ -46,8 +47,7 @@ from
   join
   (select distinct key from src) t2
   on (t2.key-1) = t1.db_id
+  where t1.name IN ("src", "dbs", "tables")
 order by a,b;
 
-show tables;
-
 describe tables;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join0.q 
b/ql/src/test/queries/clientpositive/join0.q
index 3252847..d099ea7 100644
--- a/ql/src/test/queries/clientpositive/join0.q
+++ b/ql/src/test/queries/clientpositive/join0.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join1.q 
b/ql/src/test/queries/clientpositive/join1.q
index 72bd611..25759a8 100644
--- a/ql/src/test/queries/clientpositive/join1.q
+++ b/ql/src/test/queries/clientpositive/join1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join10.q 
b/ql/src/test/queries/clientpositive/join10.q
index c3cbfea..3e65461 100644
--- a/ql/src/test/queries/clientpositive/join10.q
+++ b/ql/src/test/queries/clientpositive/join10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join11.q 
b/ql/src/test/queries/clientpositive/join11.q
index 59c54c4..c833574 100644
--- a/ql/src/test/queries/clientpositive/join11.q
+++ b/ql/src/test/queries/clientpositive/join11.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join12.q 
b/ql/src/test/queries/clientpositive/join12.q
index 6545fae..87127c3 100644
--- a/ql/src/test/queries/clientpositive/join12.q
+++ b/ql/src/test/queries/clientpositive/join12.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join13.q 
b/ql/src/test/queries/clientpositive/join13.q
index 4206f6a..1c349a3 100644
--- a/ql/src/test/queries/clientpositive/join13.q
+++ b/ql/src/test/queries/clientpositive/join13.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join14.q 
b/ql/src/test/queries/clientpositive/join14.q
index d4bc0ae..d233b42 100644
--- a/ql/src/test/queries/clientpositive/join14.q
+++ b/ql/src/test/queries/clientpositive/join14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join14_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join14_hadoop20.q 
b/ql/src/test/queries/clientpositive/join14_hadoop20.q
index a12ef1a..e9107b5 100644
--- a/ql/src/test/queries/clientpositive/join14_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/join14_hadoop20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 
 CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join15.q 
b/ql/src/test/queries/clientpositive/join15.q
index 4d2f8d5..0ae46c5 100644
--- a/ql/src/test/queries/clientpositive/join15.q
+++ b/ql/src/test/queries/clientpositive/join15.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

Reply via email to