http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_gby.q 
b/ql/src/test/queries/clientpositive/cbo_gby.q
index 7aca53a..cab45db 100644
--- a/ql/src/test/queries/clientpositive/cbo_gby.q
+++ b/ql/src/test/queries/clientpositive/cbo_gby.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_gby_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_gby_empty.q 
b/ql/src/test/queries/clientpositive/cbo_gby_empty.q
index 7b23d01..3232932 100644
--- a/ql/src/test/queries/clientpositive/cbo_gby_empty.q
+++ b/ql/src/test/queries/clientpositive/cbo_gby_empty.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:cbo_t3
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_input26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_input26.q 
b/ql/src/test/queries/clientpositive/cbo_input26.q
index 40050f9..7ddce75 100644
--- a/ql/src/test/queries/clientpositive/cbo_input26.q
+++ b/ql/src/test/queries/clientpositive/cbo_input26.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.optimize.constant.propagation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_join.q 
b/ql/src/test/queries/clientpositive/cbo_join.q
index eef2440..fb3fce7 100644
--- a/ql/src/test/queries/clientpositive/cbo_join.q
+++ b/ql/src/test/queries/clientpositive/cbo_join.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_limit.q 
b/ql/src/test/queries/clientpositive/cbo_limit.q
index 5e54a1b..24c1eae 100644
--- a/ql/src/test/queries/clientpositive/cbo_limit.q
+++ b/ql/src/test/queries/clientpositive/cbo_limit.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q 
b/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
index e64fd41..5929ad7 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_auto_join0.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.stats.fetch.column.stats=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_auto_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_auto_join1.q 
b/ql/src/test/queries/clientpositive/cbo_rp_auto_join1.q
index e9e434c..9137669 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_auto_join1.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_auto_join1.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.cbo.returnpath.hiveop=true;
 set hive.stats.fetch.column.stats=true;
 set hive.optimize.semijoin.conversion=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q 
b/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
index f7da842..ae17ec6 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_auto_join17.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.auto.convert.join = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q 
b/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
index 8ab2486..6ada9ae 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_cross_product_check_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.explain.user=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_gby.q 
b/ql/src/test/queries/clientpositive/cbo_rp_gby.q
index 7aca53a..cab45db 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_gby.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_gby.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q 
b/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
index 48d8cb1..3c99ef4 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_gby_empty.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:cbo_t3
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q 
b/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
index 921b25c..ff2fbfb 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_groupby3_noskew_multi_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.returnpath.hiveop=true;
 set hive.map.aggr=false;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_join.q 
b/ql/src/test/queries/clientpositive/cbo_rp_join.q
index eef2440..fb3fce7 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_join.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_join.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_join0.q 
b/ql/src/test/queries/clientpositive/cbo_rp_join0.q
index 6543fd8..35e042b 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_join0.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_join0.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_limit.q 
b/ql/src/test/queries/clientpositive/cbo_rp_limit.q
index 5e54a1b..24c1eae 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_limit.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_limit.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q 
b/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
index 2de2434..47c8168 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_lineage2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q 
b/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
index d8f726e..30e97cc 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_outer_join_ppr.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q 
b/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
index 57db490..ebd76ce 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_semijoin.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q 
b/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
index deb0f8f..3f2650b 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_simple_select.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_stats.q 
b/ql/src/test/queries/clientpositive/cbo_rp_stats.q
index 7674a99..cfa917f 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_stats.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_subq_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_subq_exists.q 
b/ql/src/test/queries/clientpositive/cbo_rp_subq_exists.q
index 151ebe0..692bb41 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_subq_exists.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_subq_exists.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_cbo
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q 
b/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
index 612b392..67b1150 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_subq_in.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src_cbo
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q 
b/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
index 93de2c9..fee5274 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_subq_not_in.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src_cbo
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile.q 
b/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile.q
index 125bf0a..63568f7 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.returnpath.hiveop=true;
 
 DESCRIBE FUNCTION percentile;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile2.q 
b/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile2.q
index 6dd76a2..32c5b1e 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_udf_percentile2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.returnpath.hiveop=true;
 
 DESCRIBE FUNCTION percentile;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_union.q 
b/ql/src/test/queries/clientpositive/cbo_rp_union.q
index cf2cf40..df29658 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_union.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_union.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_unionDistinct_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_unionDistinct_2.q 
b/ql/src/test/queries/clientpositive/cbo_rp_unionDistinct_2.q
index 6df4e07..8f132f2 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_unionDistinct_2.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_unionDistinct_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.returnpath.hiveop=true;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_views.q 
b/ql/src/test/queries/clientpositive/cbo_rp_views.q
index 5f7f3e0..d1f2bcb 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_views.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_views.q
@@ -1,3 +1,5 @@
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_rp_windowing.q 
b/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
index edd19c9..23caf15 100644
--- a/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
+++ b/ql/src/test/queries/clientpositive/cbo_rp_windowing.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.cbo.returnpath.hiveop=true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_semijoin.q 
b/ql/src/test/queries/clientpositive/cbo_semijoin.q
index 57db490..ebd76ce 100644
--- a/ql/src/test/queries/clientpositive/cbo_semijoin.q
+++ b/ql/src/test/queries/clientpositive/cbo_semijoin.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_simple_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_simple_select.q 
b/ql/src/test/queries/clientpositive/cbo_simple_select.q
index 2d95233..59f093e 100644
--- a/ql/src/test/queries/clientpositive/cbo_simple_select.q
+++ b/ql/src/test/queries/clientpositive/cbo_simple_select.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_stats.q 
b/ql/src/test/queries/clientpositive/cbo_stats.q
index fdc9119..dfd6b5c 100644
--- a/ql/src/test/queries/clientpositive/cbo_stats.q
+++ b/ql/src/test/queries/clientpositive/cbo_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_subq_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_subq_exists.q 
b/ql/src/test/queries/clientpositive/cbo_subq_exists.q
index 66f89ab..bc71840 100644
--- a/ql/src/test/queries/clientpositive/cbo_subq_exists.q
+++ b/ql/src/test/queries/clientpositive/cbo_subq_exists.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_cbo
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_subq_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_subq_in.q 
b/ql/src/test/queries/clientpositive/cbo_subq_in.q
index 4cbee19..0245771 100644
--- a/ql/src/test/queries/clientpositive/cbo_subq_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_subq_in.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src_cbo
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_subq_not_in.q 
b/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
index e8e3dc2..b3dd653 100644
--- a/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
+++ b/ql/src/test/queries/clientpositive/cbo_subq_not_in.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src_cbo
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q 
b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
index 8534cec..680726d 100644
--- a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
+++ b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:cbo_t1
 set hive.compute.query.using.stats=false;
 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/cbo_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_union.q 
b/ql/src/test/queries/clientpositive/cbo_union.q
index 42d28e1..8ae556f 100644
--- a/ql/src/test/queries/clientpositive/cbo_union.q
+++ b/ql/src/test/queries/clientpositive/cbo_union.q
@@ -1,3 +1,6 @@
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_views.q 
b/ql/src/test/queries/clientpositive/cbo_views.q
index 8a563cf..650bad6 100644
--- a/ql/src/test/queries/clientpositive/cbo_views.q
+++ b/ql/src/test/queries/clientpositive/cbo_views.q
@@ -1,3 +1,5 @@
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_windowing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_windowing.q 
b/ql/src/test/queries/clientpositive/cbo_windowing.q
index 4fb0351..c39f684 100644
--- a/ql/src/test/queries/clientpositive/cbo_windowing.q
+++ b/ql/src/test/queries/clientpositive/cbo_windowing.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/char_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_1.q 
b/ql/src/test/queries/clientpositive/char_1.q
index 09987cb..c4f7e67 100644
--- a/ql/src/test/queries/clientpositive/char_1.q
+++ b/ql/src/test/queries/clientpositive/char_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/char_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_2.q 
b/ql/src/test/queries/clientpositive/char_2.q
index 3e4900c..e50aa14 100644
--- a/ql/src/test/queries/clientpositive/char_2.q
+++ b/ql/src/test/queries/clientpositive/char_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table char_2;
 
 create table char_2 (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/char_cast.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_cast.q 
b/ql/src/test/queries/clientpositive/char_cast.q
index 7f44d4d..361fed3 100644
--- a/ql/src/test/queries/clientpositive/char_cast.q
+++ b/ql/src/test/queries/clientpositive/char_cast.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 -- Cast from char to other data types
 select

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/char_comparison.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_comparison.q 
b/ql/src/test/queries/clientpositive/char_comparison.q
index e1cfdb2..82c9d6a 100644
--- a/ql/src/test/queries/clientpositive/char_comparison.q
+++ b/ql/src/test/queries/clientpositive/char_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/char_nested_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_nested_types.q 
b/ql/src/test/queries/clientpositive/char_nested_types.q
index c710b6c..28963a20 100644
--- a/ql/src/test/queries/clientpositive/char_nested_types.q
+++ b/ql/src/test/queries/clientpositive/char_nested_types.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table char_nested_1;
 drop table char_nested_array;
 drop table char_nested_map;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/char_udf1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/char_udf1.q 
b/ql/src/test/queries/clientpositive/char_udf1.q
index fa3a261..2044043 100644
--- a/ql/src/test/queries/clientpositive/char_udf1.q
+++ b/ql/src/test/queries/clientpositive/char_udf1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table char_udf_1;
 
 create table char_udf_1 (c1 string, c2 string, c3 char(10), c4 char(20));

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cluster.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cluster.q 
b/ql/src/test/queries/clientpositive/cluster.q
index 2481970..64485fe 100644
--- a/ql/src/test/queries/clientpositive/cluster.q
+++ b/ql/src/test/queries/clientpositive/cluster.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT * FROM SRC x where x.key = 10 CLUSTER BY x.key;
 SELECT * FROM SRC x where x.key = 10 CLUSTER BY x.key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/column_access_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/column_access_stats.q 
b/ql/src/test/queries/clientpositive/column_access_stats.q
index b981ee4..8a7f476 100644
--- a/ql/src/test/queries/clientpositive/column_access_stats.q
+++ b/ql/src/test/queries/clientpositive/column_access_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.CheckColumnAccessHook;
 SET hive.stats.collect.scancols=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/column_pruner_multiple_children.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/column_pruner_multiple_children.q 
b/ql/src/test/queries/clientpositive/column_pruner_multiple_children.q
index 9315239..cb605a8 100644
--- a/ql/src/test/queries/clientpositive/column_pruner_multiple_children.q
+++ b/ql/src/test/queries/clientpositive/column_pruner_multiple_children.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 set hive.stats.column.autogather=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/columnarserde_create_shortcut.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/columnarserde_create_shortcut.q 
b/ql/src/test/queries/clientpositive/columnarserde_create_shortcut.q
index 851a821..b55cc1d 100644
--- a/ql/src/test/queries/clientpositive/columnarserde_create_shortcut.q
+++ b/ql/src/test/queries/clientpositive/columnarserde_create_shortcut.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src_thrift
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE columnarserde_create_shortcut(a array<int>, b array<string>, c 
map<string,string>, d int, e string) STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/columnstats_part_coltype.q 
b/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
index 472d227..e6ea25a 100644
--- a/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
+++ b/ql/src/test/queries/clientpositive/columnstats_part_coltype.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 -- Test type date, int, and string in partition column
 drop table if exists partcolstats;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/combine1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/combine1.q 
b/ql/src/test/queries/clientpositive/combine1.q
index b300830..8f05321 100644
--- a/ql/src/test/queries/clientpositive/combine1.q
+++ b/ql/src/test/queries/clientpositive/combine1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.compress.output = true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
 set mapred.min.split.size=256;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/combine2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/combine2.q 
b/ql/src/test/queries/clientpositive/combine2.q
index ba2b8f3..313d03c 100644
--- a/ql/src/test/queries/clientpositive/combine2.q
+++ b/ql/src/test/queries/clientpositive/combine2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 USE default;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/combine2_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/combine2_hadoop20.q 
b/ql/src/test/queries/clientpositive/combine2_hadoop20.q
index 8095cf6..3f45ae5 100644
--- a/ql/src/test/queries/clientpositive/combine2_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/combine2_hadoop20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 USE default;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/combine3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/combine3.q 
b/ql/src/test/queries/clientpositive/combine3.q
index 9e5809b..479108f 100644
--- a/ql/src/test/queries/clientpositive/combine3.q
+++ b/ql/src/test/queries/clientpositive/combine3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.compress.output = true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
 set mapred.min.split.size=256;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/comments.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/comments.q 
b/ql/src/test/queries/clientpositive/comments.q
index b03cd3f..b8d69d7 100644
--- a/ql/src/test/queries/clientpositive/comments.q
+++ b/ql/src/test/queries/clientpositive/comments.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- COMMENT
 select key from src limit 1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/compile_processor.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/compile_processor.q 
b/ql/src/test/queries/clientpositive/compile_processor.q
index 6be02ec..ed52c02 100644
--- a/ql/src/test/queries/clientpositive/compile_processor.q
+++ b/ql/src/test/queries/clientpositive/compile_processor.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 compile `import org.apache.hadoop.hive.ql.exec.UDF \;
 public class Pyth extends UDF {

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/complex_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/complex_alias.q 
b/ql/src/test/queries/clientpositive/complex_alias.q
index d506a34..7f0baa7 100644
--- a/ql/src/test/queries/clientpositive/complex_alias.q
+++ b/ql/src/test/queries/clientpositive/complex_alias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE agg1 (col0 INT, col1 STRING, col2 DOUBLE);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/concat_op.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/concat_op.q 
b/ql/src/test/queries/clientpositive/concat_op.q
index 3fa0ce4..9b0487b 100644
--- a/ql/src/test/queries/clientpositive/concat_op.q
+++ b/ql/src/test/queries/clientpositive/concat_op.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain select key || value from src;
 
 select concat('a','b','c');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/concatenate_inherit_table_location.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/concatenate_inherit_table_location.q 
b/ql/src/test/queries/clientpositive/concatenate_inherit_table_location.q
index 1ae1943..8deaf68 100644
--- a/ql/src/test/queries/clientpositive/concatenate_inherit_table_location.q
+++ b/ql/src/test/queries/clientpositive/concatenate_inherit_table_location.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 CREATE TABLE citl_table (key STRING, value STRING) PARTITIONED BY (part STRING)
 STORED AS RCFILE
 LOCATION 'pfile:${system:test.tmp.dir}/citl_table';

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/confirm_initial_tbl_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/confirm_initial_tbl_stats.q 
b/ql/src/test/queries/clientpositive/confirm_initial_tbl_stats.q
index 6b094f7..aa9d62a 100644
--- a/ql/src/test/queries/clientpositive/confirm_initial_tbl_stats.q
+++ b/ql/src/test/queries/clientpositive/confirm_initial_tbl_stats.q
@@ -1,3 +1,11 @@
+--! qt:dataset:srcpart
+--! qt:dataset:srcbucket2
+--! qt:dataset:srcbucket
+--! qt:dataset:src_sequencefile
+--! qt:dataset:src_json
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 describe extended src;
 
 describe formatted src key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q 
b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
index cc6c46a..d7558d6 100644
--- a/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.q
+++ b/ql/src/test/queries/clientpositive/constantPropagateForSubQuery.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/constant_prop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constant_prop.q 
b/ql/src/test/queries/clientpositive/constant_prop.q
index d51b801..e4ab8e7 100644
--- a/ql/src/test/queries/clientpositive/constant_prop.q
+++ b/ql/src/test/queries/clientpositive/constant_prop.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constant_prop_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constant_prop_2.q 
b/ql/src/test/queries/clientpositive/constant_prop_2.q
index 4bc14a6..ab4c042 100644
--- a/ql/src/test/queries/clientpositive/constant_prop_2.q
+++ b/ql/src/test/queries/clientpositive/constant_prop_2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.compute.query.using.stats=true;
 set hive.stats.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constantfolding.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constantfolding.q 
b/ql/src/test/queries/clientpositive/constantfolding.q
index 4ddb710..210d35e 100644
--- a/ql/src/test/queries/clientpositive/constantfolding.q
+++ b/ql/src/test/queries/clientpositive/constantfolding.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog1.q 
b/ql/src/test/queries/clientpositive/constprog1.q
index b8adccc..aa5a251 100644
--- a/ql/src/test/queries/clientpositive/constprog1.q
+++ b/ql/src/test/queries/clientpositive/constprog1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 set hive.optimize.constant.propagation=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog2.q 
b/ql/src/test/queries/clientpositive/constprog2.q
index dbebd34..20db22f 100644
--- a/ql/src/test/queries/clientpositive/constprog2.q
+++ b/ql/src/test/queries/clientpositive/constprog2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:src1
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 set hive.optimize.constant.propagation=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog_dp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_dp.q 
b/ql/src/test/queries/clientpositive/constprog_dp.q
index 7dad040..d7fcb5e 100644
--- a/ql/src/test/queries/clientpositive/constprog_dp.q
+++ b/ql/src/test/queries/clientpositive/constprog_dp.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.optimize.constant.propagation=true;
 set hive.exec.dynamic.partition.mode=nonstrict;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog_partitioner.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_partitioner.q 
b/ql/src/test/queries/clientpositive/constprog_partitioner.q
index ba55031..8b384e9 100644
--- a/ql/src/test/queries/clientpositive/constprog_partitioner.q
+++ b/ql/src/test/queries/clientpositive/constprog_partitioner.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:src1
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 set hive.optimize.constant.propagation=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_type.q 
b/ql/src/test/queries/clientpositive/constprog_type.q
index 5683a48..05e091a 100644
--- a/ql/src/test/queries/clientpositive/constprog_type.q
+++ b/ql/src/test/queries/clientpositive/constprog_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.constant.propagation=true;
 
 CREATE TABLE dest1(d date, t timestamp);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/constprog_when_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_when_case.q 
b/ql/src/test/queries/clientpositive/constprog_when_case.q
index b2a10f3..37d0a56 100644
--- a/ql/src/test/queries/clientpositive/constprog_when_case.q
+++ b/ql/src/test/queries/clientpositive/constprog_when_case.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=none;
 set hive.explain.user=false;
 set hive.vectorized.execution.enabled=true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer10.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer10.q
index b8fb9a7..4f703e0 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer10.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer10.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer11.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer11.q
index 4cf53f7..8c99141 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer11.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer11.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 -- Tests in this file are used to make sure Correlation Optimizer

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer12.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer12.q
index 409cdb4..12b9c3a 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer12.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer12.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=true;
 -- Currently, correlation optimizer does not support PTF operator

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer13.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer13.q
index 495ff58..bb780f7 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer13.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE tmp(c1 INT, c2 INT, c3 STRING, c4 STRING);
 INSERT OVERWRITE TABLE tmp

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer14.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer14.q
index 7f191d2..01416a3 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer14.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.reducededuplication=true;
 set hive.optimize.reducededuplication.min.reducer=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer15.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer15.q
index a06aca2..f7ce14a 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer15.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer15.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer2.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer2.q
index eeccd24..6656084 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer2.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer3.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer3.q
index 94c1bfa..e19ff8b 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer3.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer6.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer6.q
index 3cc679a..f9c948b 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer6.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer7.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer7.q
index 79b3b31..0d57d7e 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer7.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer8.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer8.q
index a52b4b9..14ac192 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer8.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer8.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=false;
 set hive.optimize.correlation=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/correlationoptimizer9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/correlationoptimizer9.q 
b/ql/src/test/queries/clientpositive/correlationoptimizer9.q
index 906f026..38f9480 100644
--- a/ql/src/test/queries/clientpositive/correlationoptimizer9.q
+++ b/ql/src/test/queries/clientpositive/correlationoptimizer9.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/count_dist_rewrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/count_dist_rewrite.q 
b/ql/src/test/queries/clientpositive/count_dist_rewrite.q
index 4bb25cc..5617c58 100644
--- a/ql/src/test/queries/clientpositive/count_dist_rewrite.q
+++ b/ql/src/test/queries/clientpositive/count_dist_rewrite.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.metadataonly=true;
 
 explain select count(distinct key) from src; 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cp_mj_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cp_mj_rc.q 
b/ql/src/test/queries/clientpositive/cp_mj_rc.q
index 62d38e3..3fd8217 100644
--- a/ql/src/test/queries/clientpositive/cp_mj_rc.q
+++ b/ql/src/test/queries/clientpositive/cp_mj_rc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table src_six_columns (k1 string, v1 string, k2 string, v2 string, k3 
string, v3 string) stored as rcfile;
 insert overwrite table src_six_columns select value, value, key, value, value, 
value from src;
 create table src_two_columns (k1 string, v1 string) stored as rcfile;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cp_sel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cp_sel.q 
b/ql/src/test/queries/clientpositive/cp_sel.q
index 59f5a2d..0a9949b 100644
--- a/ql/src/test/queries/clientpositive/cp_sel.q
+++ b/ql/src/test/queries/clientpositive/cp_sel.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 explain
 select key,value,'hello' as ds, 'world' as hr from srcpart where hr=11 order 
by 1 limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_big_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_big_view.q 
b/ql/src/test/queries/clientpositive/create_big_view.q
index 49caacc..b3b5041 100644
--- a/ql/src/test/queries/clientpositive/create_big_view.q
+++ b/ql/src/test/queries/clientpositive/create_big_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP VIEW big_view;
 
 -- Define a view with long SQL text to test metastore and other limits.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_escape.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_escape.q 
b/ql/src/test/queries/clientpositive/create_escape.q
index 49f7c5f..d30b0da 100644
--- a/ql/src/test/queries/clientpositive/create_escape.q
+++ b/ql/src/test/queries/clientpositive/create_escape.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE table1 (a STRING, b STRING)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\'
 STORED AS TEXTFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_func1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_func1.q 
b/ql/src/test/queries/clientpositive/create_func1.q
index 6f5f7f2..eef07f6 100644
--- a/ql/src/test/queries/clientpositive/create_func1.q
+++ b/ql/src/test/queries/clientpositive/create_func1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 -- qtest_get_java_boolean should already be created during test initialization
 select qtest_get_java_boolean('true'), qtest_get_java_boolean('false') from 
src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_genericudaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_genericudaf.q 
b/ql/src/test/queries/clientpositive/create_genericudaf.q
index a59a2ad..18cafb1 100644
--- a/ql/src/test/queries/clientpositive/create_genericudaf.q
+++ b/ql/src/test/queries/clientpositive/create_genericudaf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 CREATE TEMPORARY FUNCTION test_avg AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage';

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_genericudf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_genericudf.q 
b/ql/src/test/queries/clientpositive/create_genericudf.q
index 1d43f30..ad67027 100644
--- a/ql/src/test/queries/clientpositive/create_genericudf.q
+++ b/ql/src/test/queries/clientpositive/create_genericudf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate';
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_like.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like.q 
b/ql/src/test/queries/clientpositive/create_like.q
index 81172f3..b362627 100644
--- a/ql/src/test/queries/clientpositive/create_like.q
+++ b/ql/src/test/queries/clientpositive/create_like.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_like_tbl_props.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like_tbl_props.q 
b/ql/src/test/queries/clientpositive/create_like_tbl_props.q
index 8f951d1..7e1e115 100644
--- a/ql/src/test/queries/clientpositive/create_like_tbl_props.q
+++ b/ql/src/test/queries/clientpositive/create_like_tbl_props.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Test that CREATE TABLE LIKE commands can take explicit table properties
 
 CREATE TABLE test_table LIKE src TBLPROPERTIES('key'='value');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_like_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_like_view.q 
b/ql/src/test/queries/clientpositive/create_like_view.q
index 1ee4439..874389f 100644
--- a/ql/src/test/queries/clientpositive/create_like_view.q
+++ b/ql/src/test/queries/clientpositive/create_like_view.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 DROP TABLE IF EXISTS table1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_or_replace_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_or_replace_view.q 
b/ql/src/test/queries/clientpositive/create_or_replace_view.q
index 0148224..d00e5f7 100644
--- a/ql/src/test/queries/clientpositive/create_or_replace_view.q
+++ b/ql/src/test/queries/clientpositive/create_or_replace_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 create database vt;
 
 create view vt.v as select * from srcpart;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_table_like_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_table_like_stats.q 
b/ql/src/test/queries/clientpositive/create_table_like_stats.q
index 1fc7777..a59c0a6 100644
--- a/ql/src/test/queries/clientpositive/create_table_like_stats.q
+++ b/ql/src/test/queries/clientpositive/create_table_like_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/t;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_udaf.q 
b/ql/src/test/queries/clientpositive/create_udaf.q
index a6bd7a0..ee310aa 100644
--- a/ql/src/test/queries/clientpositive/create_udaf.q
+++ b/ql/src/test/queries/clientpositive/create_udaf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view.q 
b/ql/src/test/queries/clientpositive/create_view.q
index e1761cf..b04b5d8 100644
--- a/ql/src/test/queries/clientpositive/create_view.q
+++ b/ql/src/test/queries/clientpositive/create_view.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 DROP VIEW view1;
 DROP VIEW view2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_view_defaultformats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view_defaultformats.q 
b/ql/src/test/queries/clientpositive/create_view_defaultformats.q
index 66fa141..ad6ca7b 100644
--- a/ql/src/test/queries/clientpositive/create_view_defaultformats.q
+++ b/ql/src/test/queries/clientpositive/create_view_defaultformats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop view if exists sfsrc;
 drop view if exists rcsrc;
 set hive.default.fileformat=SequenceFile;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_view_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view_partitioned.q 
b/ql/src/test/queries/clientpositive/create_view_partitioned.q
index 4374985..5116b13 100644
--- a/ql/src/test/queries/clientpositive/create_view_partitioned.q
+++ b/ql/src/test/queries/clientpositive/create_view_partitioned.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 DROP VIEW vp1;
 DROP VIEW vp2;
 DROP VIEW vp3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/create_view_translate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/create_view_translate.q 
b/ql/src/test/queries/clientpositive/create_view_translate.q
index 11ba9c8..f4704c7 100644
--- a/ql/src/test/queries/clientpositive/create_view_translate.q
+++ b/ql/src/test/queries/clientpositive/create_view_translate.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop view if exists v;
 drop view if exists w;
 

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cross_prod_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_1.q 
b/ql/src/test/queries/clientpositive/cross_prod_1.q
index b5a84ea..82c80ae 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_1.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.tez.cartesian-product.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cross_prod_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_3.q 
b/ql/src/test/queries/clientpositive/cross_prod_3.q
index a233f17..22761e8 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_3.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.tez.cartesian-product.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cross_prod_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_prod_4.q 
b/ql/src/test/queries/clientpositive/cross_prod_4.q
index ea58e98..64f9605 100644
--- a/ql/src/test/queries/clientpositive/cross_prod_4.q
+++ b/ql/src/test/queries/clientpositive/cross_prod_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cross_product_check_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_1.q 
b/ql/src/test/queries/clientpositive/cross_product_check_1.q
index bbc7297..efcafd3 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_1.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_1.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/cross_product_check_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cross_product_check_2.q 
b/ql/src/test/queries/clientpositive/cross_product_check_2.q
index 8acb069..60ec9e1 100644
--- a/ql/src/test/queries/clientpositive/cross_product_check_2.q
+++ b/ql/src/test/queries/clientpositive/cross_product_check_2.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/crtseltbl_serdeprops.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/crtseltbl_serdeprops.q 
b/ql/src/test/queries/clientpositive/crtseltbl_serdeprops.q
index 6e73bc2..162dd4a 100644
--- a/ql/src/test/queries/clientpositive/crtseltbl_serdeprops.q
+++ b/ql/src/test/queries/clientpositive/crtseltbl_serdeprops.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/tmpsepatest;
 CREATE TABLE separator_test 
 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas.q 
b/ql/src/test/queries/clientpositive/ctas.q
index 57a4729..dbed475 100644
--- a/ql/src/test/queries/clientpositive/ctas.q
+++ b/ql/src/test/queries/clientpositive/ctas.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S)
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas_char.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_char.q 
b/ql/src/test/queries/clientpositive/ctas_char.q
index ecfe74a..9d79dc8 100644
--- a/ql/src/test/queries/clientpositive/ctas_char.q
+++ b/ql/src/test/queries/clientpositive/ctas_char.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ctas_char_1;
 drop table ctas_char_2;
 drop view ctas_char_3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas_colname.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_colname.q 
b/ql/src/test/queries/clientpositive/ctas_colname.q
index b5568fb..5470ece 100644
--- a/ql/src/test/queries/clientpositive/ctas_colname.q
+++ b/ql/src/test/queries/clientpositive/ctas_colname.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/ctas_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_date.q 
b/ql/src/test/queries/clientpositive/ctas_date.q
index 03af69f..2f0e9c0 100644
--- a/ql/src/test/queries/clientpositive/ctas_date.q
+++ b/ql/src/test/queries/clientpositive/ctas_date.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ctas_date_1;
 drop table ctas_date_2;
 drop view ctas_date_3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas_uses_database_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_uses_database_location.q 
b/ql/src/test/queries/clientpositive/ctas_uses_database_location.q
index 86c940a..1c21981 100644
--- a/ql/src/test/queries/clientpositive/ctas_uses_database_location.q
+++ b/ql/src/test/queries/clientpositive/ctas_uses_database_location.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.metastore.warehouse.dir=invalid_scheme://${system:test.tmp.dir};
 
 -- Tests that CTAS queries in non-default databases use the location of the 
database

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas_uses_table_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_uses_table_location.q 
b/ql/src/test/queries/clientpositive/ctas_uses_table_location.q
index b11e3bd..560ea85 100644
--- a/ql/src/test/queries/clientpositive/ctas_uses_table_location.q
+++ b/ql/src/test/queries/clientpositive/ctas_uses_table_location.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 CREATE TABLE ctas_table_with_loc LOCATION 
'${hiveconf:hive.metastore.warehouse.dir}/default/ctas_table_with_loc' AS 
SELECT * FROM default.src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ctas_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ctas_varchar.q 
b/ql/src/test/queries/clientpositive/ctas_varchar.q
index f646b36..8046a76 100644
--- a/ql/src/test/queries/clientpositive/ctas_varchar.q
+++ b/ql/src/test/queries/clientpositive/ctas_varchar.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ctas_varchar_1;
 drop table ctas_varchar_2;
 drop view ctas_varchar_3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cteViews.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cteViews.q 
b/ql/src/test/queries/clientpositive/cteViews.q
index 4567b47..d80357f 100644
--- a/ql/src/test/queries/clientpositive/cteViews.q
+++ b/ql/src/test/queries/clientpositive/cteViews.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 with src1 as (select key from src order by key limit 5)
 select * from src1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_1.q 
b/ql/src/test/queries/clientpositive/cte_1.q
index 6d4e05d..b97e18e 100644
--- a/ql/src/test/queries/clientpositive/cte_1.q
+++ b/ql/src/test/queries/clientpositive/cte_1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 explain
 with q1 as ( select key from src where key = '5')
 select *

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_2.q 
b/ql/src/test/queries/clientpositive/cte_2.q
index d226116..899a080 100644
--- a/ql/src/test/queries/clientpositive/cte_2.q
+++ b/ql/src/test/queries/clientpositive/cte_2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 
 -- union test
 with q1 as (select * from src where key= '5'),

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_3.q 
b/ql/src/test/queries/clientpositive/cte_3.q
index 037c0cb..dbb17cb 100644
--- a/ql/src/test/queries/clientpositive/cte_3.q
+++ b/ql/src/test/queries/clientpositive/cte_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=1;
 set hive.explain.user=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_4.q 
b/ql/src/test/queries/clientpositive/cte_4.q
index 0455a6a..17db131 100644
--- a/ql/src/test/queries/clientpositive/cte_4.q
+++ b/ql/src/test/queries/clientpositive/cte_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_5.q 
b/ql/src/test/queries/clientpositive/cte_5.q
index 8f6ac15..6ab2fa6 100644
--- a/ql/src/test/queries/clientpositive/cte_5.q
+++ b/ql/src/test/queries/clientpositive/cte_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=-1;
 set hive.explain.user=true;
@@ -10,7 +11,6 @@ insert into q1 values (5, 'A');
 use default;
 
 show tables in mydb;
-show tables;
 
 explain
 with q1 as (select * from src where key= '5')

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_6.q 
b/ql/src/test/queries/clientpositive/cte_6.q
index 964d1b8..471f3b9 100644
--- a/ql/src/test/queries/clientpositive/cte_6.q
+++ b/ql/src/test/queries/clientpositive/cte_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 with Q1 as ( select key from sRc where key = '5')
 select CPS.key from Q1 CPS;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_mat_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_mat_1.q 
b/ql/src/test/queries/clientpositive/cte_mat_1.q
index 1131a4b..2442108 100644
--- a/ql/src/test/queries/clientpositive/cte_mat_1.q
+++ b/ql/src/test/queries/clientpositive/cte_mat_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=-1;
 set hive.explain.user=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_mat_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_mat_2.q 
b/ql/src/test/queries/clientpositive/cte_mat_2.q
index 283aa40..bfef11b 100644
--- a/ql/src/test/queries/clientpositive/cte_mat_2.q
+++ b/ql/src/test/queries/clientpositive/cte_mat_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=3;
 set hive.explain.user=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_mat_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_mat_3.q 
b/ql/src/test/queries/clientpositive/cte_mat_3.q
index a6c3a86..41d8edf 100644
--- a/ql/src/test/queries/clientpositive/cte_mat_3.q
+++ b/ql/src/test/queries/clientpositive/cte_mat_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=2;
 set hive.explain.user=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_mat_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_mat_4.q 
b/ql/src/test/queries/clientpositive/cte_mat_4.q
index c52d9a2..5b8b8b8 100644
--- a/ql/src/test/queries/clientpositive/cte_mat_4.q
+++ b/ql/src/test/queries/clientpositive/cte_mat_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=2;
 set hive.explain.user=true;
@@ -5,7 +6,7 @@ set hive.explain.user=true;
 create temporary table q1 (a int, b string);
 insert into q1 values (1, 'A');
 
-show tables;
+show tables like "q1";
 
 explain
 with q1 as (select * from src where key= '5')
@@ -18,13 +19,13 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key;
 
-show tables;
+show tables like "q1";
 
 select * from q1;
 
 drop table q1;
 
-show tables;
+show tables like "q1";
 
 explain
 with q1 as (select * from src where key= '5')
@@ -37,4 +38,4 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key;
 
-show tables;
+show tables like "q1";

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cte_mat_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cte_mat_5.q 
b/ql/src/test/queries/clientpositive/cte_mat_5.q
index 83d1eab..1d2f79d 100644
--- a/ql/src/test/queries/clientpositive/cte_mat_5.q
+++ b/ql/src/test/queries/clientpositive/cte_mat_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.cte.materialize.threshold=1;
 set hive.explain.user=true;
@@ -10,7 +11,6 @@ insert into q1 values (5, 'A');
 use default;
 
 show tables in mydb;
-show tables;
 
 explain
 with q1 as (select * from src where key= '5')

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/current_date_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/current_date_timestamp.q 
b/ql/src/test/queries/clientpositive/current_date_timestamp.q
index a1157ce..8715b97 100644
--- a/ql/src/test/queries/clientpositive/current_date_timestamp.q
+++ b/ql/src/test/queries/clientpositive/current_date_timestamp.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 select current_timestamp = current_timestamp(), current_date = current_date() 
from src limit 5;
 
 set hive.test.currenttimestamp =2012-01-01 01:02:03;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/custom_input_output_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/custom_input_output_format.q 
b/ql/src/test/queries/clientpositive/custom_input_output_format.q
index 949303a..9562124 100644
--- a/ql/src/test/queries/clientpositive/custom_input_output_format.q
+++ b/ql/src/test/queries/clientpositive/custom_input_output_format.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE src1_rot13_iof(key STRING, value STRING)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/database.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database.q 
b/ql/src/test/queries/clientpositive/database.q
index 322dce5..77d211a 100644
--- a/ql/src/test/queries/clientpositive/database.q
+++ b/ql/src/test/queries/clientpositive/database.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/database_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database_drop.q 
b/ql/src/test/queries/clientpositive/database_drop.q
index 1a892e7..cf33ea9 100644
--- a/ql/src/test/queries/clientpositive/database_drop.q
+++ b/ql/src/test/queries/clientpositive/database_drop.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- create database with multiple tables, views.
 -- Use both partitioned and non-partitioned tables, as well as
 -- tables with specific storage locations

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_1.q 
b/ql/src/test/queries/clientpositive/date_1.q
index 7d89ac9..c777460 100644
--- a/ql/src/test/queries/clientpositive/date_1.q
+++ b/ql/src/test/queries/clientpositive/date_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 drop table date_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_3.q 
b/ql/src/test/queries/clientpositive/date_3.q
index 383fb4e..b33d8dc 100644
--- a/ql/src/test/queries/clientpositive/date_3.q
+++ b/ql/src/test/queries/clientpositive/date_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table date_3;
 
 create table date_3 (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_4.q 
b/ql/src/test/queries/clientpositive/date_4.q
index c840089..6a9b44d 100644
--- a/ql/src/test/queries/clientpositive/date_4.q
+++ b/ql/src/test/queries/clientpositive/date_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 drop table date_4;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_comparison.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_comparison.q 
b/ql/src/test/queries/clientpositive/date_comparison.q
index 86c7362..d6cd83e 100644
--- a/ql/src/test/queries/clientpositive/date_comparison.q
+++ b/ql/src/test/queries/clientpositive/date_comparison.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Comparisons against same value

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_timestamp_prec.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_timestamp_prec.q 
b/ql/src/test/queries/clientpositive/date_timestamp_prec.q
index b25b13b..c7c8e0b 100644
--- a/ql/src/test/queries/clientpositive/date_timestamp_prec.q
+++ b/ql/src/test/queries/clientpositive/date_timestamp_prec.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table mytable (i integer, d date);
 
 insert overwrite table mytable 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/date_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/date_udf.q 
b/ql/src/test/queries/clientpositive/date_udf.q
index 3b82265..cddfc1a 100644
--- a/ql/src/test/queries/clientpositive/date_udf.q
+++ b/ql/src/test/queries/clientpositive/date_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table date_udf;
 drop table date_udf_string;
 drop table date_udf_flight;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/decimal_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_1.q 
b/ql/src/test/queries/clientpositive/decimal_1.q
index f52b192..bed8868 100644
--- a/ql/src/test/queries/clientpositive/decimal_1.q
+++ b/ql/src/test/queries/clientpositive/decimal_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 drop table if exists decimal_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/decimal_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_2.q 
b/ql/src/test/queries/clientpositive/decimal_2.q
index 2c4d919..164dffd 100644
--- a/ql/src/test/queries/clientpositive/decimal_2.q
+++ b/ql/src/test/queries/clientpositive/decimal_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 drop table decimal_2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/decimal_skewjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/decimal_skewjoin.q 
b/ql/src/test/queries/clientpositive/decimal_skewjoin.q
index 11c665a..e7089ef 100644
--- a/ql/src/test/queries/clientpositive/decimal_skewjoin.q
+++ b/ql/src/test/queries/clientpositive/decimal_skewjoin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.skewjoin=true;
 set hive.auto.convert.join=false;
 

Reply via email to