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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_explain_groupbyshuffle.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_explain_groupbyshuffle.q b/ql/src/test/queries/clientpositive/spark_explain_groupbyshuffle.q
index cd2cba1..c9dc56c 100644
--- a/ql/src/test/queries/clientpositive/spark_explain_groupbyshuffle.q
+++ b/ql/src/test/queries/clientpositive/spark_explain_groupbyshuffle.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.spark.use.groupby.shuffle=true;
 
 explain select key, count(value) from src group by key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_explainuser_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_explainuser_1.q b/ql/src/test/queries/clientpositive/spark_explainuser_1.q
index 43252f0..92e6554 100644
--- a/ql/src/test/queries/clientpositive/spark_explainuser_1.q
+++ b/ql/src/test/queries/clientpositive/spark_explainuser_1.q
@@ -1,3 +1,12 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src_cbo
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 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/spark_local_queries.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_local_queries.q b/ql/src/test/queries/clientpositive/spark_local_queries.q
index 8238113..e43f440 100644
--- a/ql/src/test/queries/clientpositive/spark_local_queries.q
+++ b/ql/src/test/queries/clientpositive/spark_local_queries.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 -- Some basic tests to test HoS works with spark.master = local
 
 -- Test that a basic explain plan can be generated

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_multi_insert_parallel_orderby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_multi_insert_parallel_orderby.q b/ql/src/test/queries/clientpositive/spark_multi_insert_parallel_orderby.q
index 2be0d52..bef1f85 100644
--- a/ql/src/test/queries/clientpositive/spark_multi_insert_parallel_orderby.q
+++ b/ql/src/test/queries/clientpositive/spark_multi_insert_parallel_orderby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.bytes.per.reducer=256;
 set hive.optimize.sampling.orderby=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_opt_shuffle_serde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_opt_shuffle_serde.q b/ql/src/test/queries/clientpositive/spark_opt_shuffle_serde.q
index 2c4691a..94d4d7a 100644
--- a/ql/src/test/queries/clientpositive/spark_opt_shuffle_serde.q
+++ b/ql/src/test/queries/clientpositive/spark_opt_shuffle_serde.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.spark.optimize.shuffle.serde=true;
 
 set hive.spark.use.groupby.shuffle=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_union_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_union_merge.q b/ql/src/test/queries/clientpositive/spark_union_merge.q
index 3121078..6f2b059 100644
--- a/ql/src/test/queries/clientpositive/spark_union_merge.q
+++ b/ql/src/test/queries/clientpositive/spark_union_merge.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- union case: both subqueries are map jobs on same input, followed by filesink
 -- mostly copied from union.q

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_use_op_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_use_op_stats.q b/ql/src/test/queries/clientpositive/spark_use_op_stats.q
index b559bc0..8a7ce2c 100644
--- a/ql/src/test/queries/clientpositive/spark_use_op_stats.q
+++ b/ql/src/test/queries/clientpositive/spark_use_op_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.spark.use.op.stats=false;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_use_ts_stats_for_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_use_ts_stats_for_mapjoin.q b/ql/src/test/queries/clientpositive/spark_use_ts_stats_for_mapjoin.q
index b1df562..5ee09fc 100644
--- a/ql/src/test/queries/clientpositive/spark_use_ts_stats_for_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/spark_use_ts_stats_for_mapjoin.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.spark.use.ts.stats.for.mapjoin=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_vectorized_dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_vectorized_dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/spark_vectorized_dynamic_partition_pruning.q
index 0de55ce..47c826a 100644
--- a/ql/src/test/queries/clientpositive/spark_vectorized_dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/spark_vectorized_dynamic_partition_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.spark.dynamic.partition.pruning=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/special_character_in_tabnames_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/special_character_in_tabnames_1.q b/ql/src/test/queries/clientpositive/special_character_in_tabnames_1.q
index adc23e9..67ba28d 100644
--- a/ql/src/test/queries/clientpositive/special_character_in_tabnames_1.q
+++ b/ql/src/test/queries/clientpositive/special_character_in_tabnames_1.q
@@ -1,3 +1,9 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:lineitem
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.cbo.enable=true;
 set hive.exec.check.crossproducts=false;
 set hive.stats.fetch.column.stats=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats0.q b/ql/src/test/queries/clientpositive/stats0.q
index 48b5c52..2c2fdac 100644
--- a/ql/src/test/queries/clientpositive/stats0.q
+++ b/ql/src/test/queries/clientpositive/stats0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.autogather=true;
 set datanucleus.cache.collections=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats1.q b/ql/src/test/queries/clientpositive/stats1.q
index a759122..89fe14c 100644
--- a/ql/src/test/queries/clientpositive/stats1.q
+++ b/ql/src/test/queries/clientpositive/stats1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 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/stats10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats10.q b/ql/src/test/queries/clientpositive/stats10.q
index 1732f36..0516b7d 100644
--- a/ql/src/test/queries/clientpositive/stats10.q
+++ b/ql/src/test/queries/clientpositive/stats10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats12.q b/ql/src/test/queries/clientpositive/stats12.q
index c1db346..9231d6f 100644
--- a/ql/src/test/queries/clientpositive/stats12.q
+++ b/ql/src/test/queries/clientpositive/stats12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats13.q b/ql/src/test/queries/clientpositive/stats13.q
index beb7bfa..58b26fb 100644
--- a/ql/src/test/queries/clientpositive/stats13.q
+++ b/ql/src/test/queries/clientpositive/stats13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats14.q b/ql/src/test/queries/clientpositive/stats14.q
index 8e74df5..121bf5c 100644
--- a/ql/src/test/queries/clientpositive/stats14.q
+++ b/ql/src/test/queries/clientpositive/stats14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set datanucleus.cache.collections=false;
 
 create table stats_src like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats15.q b/ql/src/test/queries/clientpositive/stats15.q
index 10908b3..5fbd4ea 100644
--- a/ql/src/test/queries/clientpositive/stats15.q
+++ b/ql/src/test/queries/clientpositive/stats15.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set datanucleus.cache.collections=false;
 
 create table stats_src like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats16.q b/ql/src/test/queries/clientpositive/stats16.q
index 0557ce6..872ab2d 100644
--- a/ql/src/test/queries/clientpositive/stats16.q
+++ b/ql/src/test/queries/clientpositive/stats16.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.autogather=false;
 
 drop table stats16;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats18.q b/ql/src/test/queries/clientpositive/stats18.q
index 6652e0e..9d30807 100644
--- a/ql/src/test/queries/clientpositive/stats18.q
+++ b/ql/src/test/queries/clientpositive/stats18.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false;
 
 set datanucleus.cache.collections=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats2.q b/ql/src/test/queries/clientpositive/stats2.q
index d6bb258..010f19e 100644
--- a/ql/src/test/queries/clientpositive/stats2.q
+++ b/ql/src/test/queries/clientpositive/stats2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats4.q b/ql/src/test/queries/clientpositive/stats4.q
index 77a83c6..59447ff 100644
--- a/ql/src/test/queries/clientpositive/stats4.q
+++ b/ql/src/test/queries/clientpositive/stats4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats5.q b/ql/src/test/queries/clientpositive/stats5.q
index 911bbff..1c368b2 100644
--- a/ql/src/test/queries/clientpositive/stats5.q
+++ b/ql/src/test/queries/clientpositive/stats5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 set datanucleus.cache.collections=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats6.q b/ql/src/test/queries/clientpositive/stats6.q
index bef6e88..82a3b3e 100644
--- a/ql/src/test/queries/clientpositive/stats6.q
+++ b/ql/src/test/queries/clientpositive/stats6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats7.q b/ql/src/test/queries/clientpositive/stats7.q
index 19d0e14..8ca7198 100644
--- a/ql/src/test/queries/clientpositive/stats7.q
+++ b/ql/src/test/queries/clientpositive/stats7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats8.q b/ql/src/test/queries/clientpositive/stats8.q
index 46002ca..70cff1d 100644
--- a/ql/src/test/queries/clientpositive/stats8.q
+++ b/ql/src/test/queries/clientpositive/stats8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats9.q b/ql/src/test/queries/clientpositive/stats9.q
index 48b2044..ac46826 100644
--- a/ql/src/test/queries/clientpositive/stats9.q
+++ b/ql/src/test/queries/clientpositive/stats9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q b/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q
index d6f84ed..f6b8b4e 100644
--- a/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q
+++ b/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, there is a dummy stats aggregator which throws an error when various
 -- methods are called (as indicated by the parameter hive.test.dummystats.aggregator)
 -- Since stats need not be reliable (by setting hive.stats.reliable to false), the 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_based_fetch_decision.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_based_fetch_decision.q b/ql/src/test/queries/clientpositive/stats_based_fetch_decision.q
index 8b6a7d9..6e4410f 100644
--- a/ql/src/test/queries/clientpositive/stats_based_fetch_decision.q
+++ b/ql/src/test/queries/clientpositive/stats_based_fetch_decision.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 SET hive.fetch.task.conversion=more;
 SET hive.explain.user=false;
 SET hive.stats.fetch.column.stats=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_empty_dyn_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_empty_dyn_part.q b/ql/src/test/queries/clientpositive/stats_empty_dyn_part.q
index 38ee6f7..bcb657a 100644
--- a/ql/src/test/queries/clientpositive/stats_empty_dyn_part.q
+++ b/ql/src/test/queries/clientpositive/stats_empty_dyn_part.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- This test verifies writing a query using dynamic partitions
 -- which results in no partitions actually being created with
 -- hive.stats.reliable set to true

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_empty_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_empty_partition.q b/ql/src/test/queries/clientpositive/stats_empty_partition.q
index 305a97c..8fb941e 100644
--- a/ql/src/test/queries/clientpositive/stats_empty_partition.q
+++ b/ql/src/test/queries/clientpositive/stats_empty_partition.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- This test verifies that writing an empty partition succeeds when
 -- hive.stats.reliable is set to true.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_filemetadata.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_filemetadata.q b/ql/src/test/queries/clientpositive/stats_filemetadata.q
index dc9f242..5ddbaac 100644
--- a/ql/src/test/queries/clientpositive/stats_filemetadata.q
+++ b/ql/src/test/queries/clientpositive/stats_filemetadata.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 CREATE TABLE many_files(key string, value string)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_invalidation.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_invalidation.q b/ql/src/test/queries/clientpositive/stats_invalidation.q
index a7fce6e..20f287f 100644
--- a/ql/src/test/queries/clientpositive/stats_invalidation.q
+++ b/ql/src/test/queries/clientpositive/stats_invalidation.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.autogather=true;
 
 CREATE TABLE stats_invalid (key string, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_list_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_list_bucket.q b/ql/src/test/queries/clientpositive/stats_list_bucket.q
index 536702c..c4339d0 100644
--- a/ql/src/test/queries/clientpositive/stats_list_bucket.q
+++ b/ql/src/test/queries/clientpositive/stats_list_bucket.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_missing_warning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_missing_warning.q b/ql/src/test/queries/clientpositive/stats_missing_warning.q
index b6cf049..fd94b70 100644
--- a/ql/src/test/queries/clientpositive/stats_missing_warning.q
+++ b/ql/src/test/queries/clientpositive/stats_missing_warning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.autogather=false;
 
 -- Explictily DROP vs. CREATE IF NOT EXISTS to ensure stats are not carried over

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_noscan_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_noscan_1.q b/ql/src/test/queries/clientpositive/stats_noscan_1.q
index 2681f77..e23a376 100644
--- a/ql/src/test/queries/clientpositive/stats_noscan_1.q
+++ b/ql/src/test/queries/clientpositive/stats_noscan_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.explain.user=false;
 set datanucleus.cache.collections=false;
 set hive.stats.autogather=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_noscan_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_noscan_2.q b/ql/src/test/queries/clientpositive/stats_noscan_2.q
index d473081..76d974f 100644
--- a/ql/src/test/queries/clientpositive/stats_noscan_2.q
+++ b/ql/src/test/queries/clientpositive/stats_noscan_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 dfs -cp ${system:hive.root}/data/files/ext_test ${system:test.tmp.dir}/analyze_external;
 
 -- test analyze table compute statistiscs [noscan] on external table 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_null_optimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_null_optimizer.q b/ql/src/test/queries/clientpositive/stats_null_optimizer.q
index 1114e5a..13b4a3c 100644
--- a/ql/src/test/queries/clientpositive/stats_null_optimizer.q
+++ b/ql/src/test/queries/clientpositive/stats_null_optimizer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain select count(key) from (select null as key from src)src;
 
 select count(key) from (select null as key from src)src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/stats_publisher_error_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/stats_publisher_error_1.q b/ql/src/test/queries/clientpositive/stats_publisher_error_1.q
index 50751f7..12ce1eb 100644
--- a/ql/src/test/queries/clientpositive/stats_publisher_error_1.q
+++ b/ql/src/test/queries/clientpositive/stats_publisher_error_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- In this test, there is a dummy stats publisher which throws an error when various
 -- methods are called (as indicated by the parameter hive.test.dummystats.publisher)
 -- Since stats need not be reliable (by setting hive.stats.reliable to false), the

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/statsfs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/statsfs.q b/ql/src/test/queries/clientpositive/statsfs.q
index 0d29067..166ba36 100644
--- a/ql/src/test/queries/clientpositive/statsfs.q
+++ b/ql/src/test/queries/clientpositive/statsfs.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.stats.dbclass=fs;
 
 -- stats computation on partitioned table with analyze command

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/str_to_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/str_to_map.q b/ql/src/test/queries/clientpositive/str_to_map.q
index 3280d89..3b4904d 100644
--- a/ql/src/test/queries/clientpositive/str_to_map.q
+++ b/ql/src/test/queries/clientpositive/str_to_map.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/struct_in_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/struct_in_view.q b/ql/src/test/queries/clientpositive/struct_in_view.q
index cbd8909..2cff74d 100644
--- a/ql/src/test/queries/clientpositive/struct_in_view.q
+++ b/ql/src/test/queries/clientpositive/struct_in_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table testreserved;
 
 create table testreserved (data struct<`end`:string, id: string>);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq.q b/ql/src/test/queries/clientpositive/subq.q
index 678620f..3bd2d07 100644
--- a/ql/src/test/queries/clientpositive/subq.q
+++ b/ql/src/test/queries/clientpositive/subq.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 FROM (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subq2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq2.q b/ql/src/test/queries/clientpositive/subq2.q
index 98e663b..12863b9 100644
--- a/ql/src/test/queries/clientpositive/subq2.q
+++ b/ql/src/test/queries/clientpositive/subq2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT a.k, a.c

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subq_where_serialization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subq_where_serialization.q b/ql/src/test/queries/clientpositive/subq_where_serialization.q
index 91290c4..de68c8a 100644
--- a/ql/src/test/queries/clientpositive/subq_where_serialization.q
+++ b/ql/src/test/queries/clientpositive/subq_where_serialization.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask.size=10000000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_alias.q b/ql/src/test/queries/clientpositive/subquery_alias.q
index fcdb64c..fdffa88 100644
--- a/ql/src/test/queries/clientpositive/subquery_alias.q
+++ b/ql/src/test/queries/clientpositive/subquery_alias.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 FROM (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_corr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_corr.q b/ql/src/test/queries/clientpositive/subquery_corr.q
index 10b4c3a..26f6e41 100644
--- a/ql/src/test/queries/clientpositive/subquery_corr.q
+++ b/ql/src/test/queries/clientpositive/subquery_corr.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 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/subquery_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists.q b/ql/src/test/queries/clientpositive/subquery_exists.q
index 08681e5..40106f9 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists.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/subquery_exists_explain_rewrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists_explain_rewrite.q b/ql/src/test/queries/clientpositive/subquery_exists_explain_rewrite.q
index d6efd98..1d689b5 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists_explain_rewrite.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists_explain_rewrite.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 
 -- no agg, corr

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_exists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_exists_having.q b/ql/src/test/queries/clientpositive/subquery_exists_having.q
index 878a0cb..af0d71c 100644
--- a/ql/src/test/queries/clientpositive/subquery_exists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_exists_having.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.correlation=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in.q b/ql/src/test/queries/clientpositive/subquery_in.q
index 7d4ece9..0fdcd00 100644
--- a/ql/src/test/queries/clientpositive/subquery_in.q
+++ b/ql/src/test/queries/clientpositive/subquery_in.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
 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/subquery_in_explain_rewrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in_explain_rewrite.q b/ql/src/test/queries/clientpositive/subquery_in_explain_rewrite.q
index 5d3f966..28319c4 100644
--- a/ql/src/test/queries/clientpositive/subquery_in_explain_rewrite.q
+++ b/ql/src/test/queries/clientpositive/subquery_in_explain_rewrite.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.cbo.enable=false;
 
 -- non agg, non corr

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_in_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_in_having.q b/ql/src/test/queries/clientpositive/subquery_in_having.q
index 0bf8657..67bb6a9 100644
--- a/ql/src/test/queries/clientpositive/subquery_in_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_in_having.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/subquery_multi.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_multi.q b/ql/src/test/queries/clientpositive/subquery_multi.q
index 780647d..81a9187 100644
--- a/ql/src/test/queries/clientpositive/subquery_multi.q
+++ b/ql/src/test/queries/clientpositive/subquery_multi.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
 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/subquery_multiinsert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_multiinsert.q b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
index 9d70f51..de064f3 100644
--- a/ql/src/test/queries/clientpositive/subquery_multiinsert.q
+++ b/ql/src/test/queries/clientpositive/subquery_multiinsert.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_nested_subquery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_nested_subquery.q b/ql/src/test/queries/clientpositive/subquery_nested_subquery.q
index 84c78b7..c345903 100644
--- a/ql/src/test/queries/clientpositive/subquery_nested_subquery.q
+++ b/ql/src/test/queries/clientpositive/subquery_nested_subquery.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select *
 from part x 
 where x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name))

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_notexists_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notexists_having.q b/ql/src/test/queries/clientpositive/subquery_notexists_having.q
index 24b0a66..cce179a 100644
--- a/ql/src/test/queries/clientpositive/subquery_notexists_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notexists_having.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/subquery_notin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin.q b/ql/src/test/queries/clientpositive/subquery_notin.q
index c509654..6fcee21 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 
 -- non agg, non corr

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_notin_having.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_notin_having.q b/ql/src/test/queries/clientpositive/subquery_notin_having.q
index 2cd0bec..bc328bb 100644
--- a/ql/src/test/queries/clientpositive/subquery_notin_having.q
+++ b/ql/src/test/queries/clientpositive/subquery_notin_having.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 -- non agg, non corr
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_scalar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_scalar.q b/ql/src/test/queries/clientpositive/subquery_scalar.q
index f644dad..781bb29 100644
--- a/ql/src/test/queries/clientpositive/subquery_scalar.q
+++ b/ql/src/test/queries/clientpositive/subquery_scalar.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src
+--! qt:dataset:part
+--! qt:dataset:lineitem
 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/subquery_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_select.q b/ql/src/test/queries/clientpositive/subquery_select.q
index c1766ff..12b2f1f 100644
--- a/ql/src/test/queries/clientpositive/subquery_select.q
+++ b/ql/src/test/queries/clientpositive/subquery_select.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- following tests test queries in SELECT
 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/subquery_shared_alias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_shared_alias.q b/ql/src/test/queries/clientpositive/subquery_shared_alias.q
index d442f07..7664e0b 100644
--- a/ql/src/test/queries/clientpositive/subquery_shared_alias.q
+++ b/ql/src/test/queries/clientpositive/subquery_shared_alias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 select *

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
index 78a8b20..50355eb 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqual_corr_expr.q
@@ -1,3 +1,4 @@
+--! 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/subquery_unqualcolumnrefs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
index dad6f23..753032d 100644
--- a/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
+++ b/ql/src/test/queries/clientpositive/subquery_unqualcolumnrefs.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 create table src11 (key1 string, value1 string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/subquery_views.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/subquery_views.q b/ql/src/test/queries/clientpositive/subquery_views.q
index 87c055b..2fae0ae 100644
--- a/ql/src/test/queries/clientpositive/subquery_views.q
+++ b/ql/src/test/queries/clientpositive/subquery_views.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/sum_expr_with_order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sum_expr_with_order.q b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
index d3e9ea5..682fd68 100644
--- a/ql/src/test/queries/clientpositive/sum_expr_with_order.q
+++ b/ql/src/test/queries/clientpositive/sum_expr_with_order.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 select 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sysdb.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sysdb.q b/ql/src/test/queries/clientpositive/sysdb.q
index 399c3ce..1dfcbce 100644
--- a/ql/src/test/queries/clientpositive/sysdb.q
+++ b/ql/src/test/queries/clientpositive/sysdb.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.strict.checks.cartesian.product=false;
 
 set hive.compute.query.using.stats=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tablename_with_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tablename_with_select.q b/ql/src/test/queries/clientpositive/tablename_with_select.q
index e4aee3c..85c3b4c 100644
--- a/ql/src/test/queries/clientpositive/tablename_with_select.q
+++ b/ql/src/test/queries/clientpositive/tablename_with_select.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 CREATE TABLE tmp_select(a INT, b STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tablevalues.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tablevalues.q b/ql/src/test/queries/clientpositive/tablevalues.q
index e3d605a..eade2ff 100644
--- a/ql/src/test/queries/clientpositive/tablevalues.q
+++ b/ql/src/test/queries/clientpositive/tablevalues.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- VALUES -> array(struct(),struct())
 -- TABLE -> LATERAL VIEW INLINE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/temp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table.q b/ql/src/test/queries/clientpositive/temp_table.q
index f820d67..8304959 100644
--- a/ql/src/test/queries/clientpositive/temp_table.q
+++ b/ql/src/test/queries/clientpositive/temp_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 EXPLAIN CREATE TEMPORARY TABLE foo AS SELECT * FROM src WHERE key % 2 = 0;
@@ -26,8 +27,6 @@ INSERT OVERWRITE TABLE bay SELECT * FROM src ORDER BY key;
 
 select * from bay order by key limit 10;
 
-SHOW TABLES;
-
 CREATE DATABASE two;
 
 USE two;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/temp_table_gb1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_gb1.q b/ql/src/test/queries/clientpositive/temp_table_gb1.q
index 07394d5..4765b4a 100644
--- a/ql/src/test/queries/clientpositive/temp_table_gb1.q
+++ b/ql/src/test/queries/clientpositive/temp_table_gb1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 set hive.map.aggr=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/temp_table_join1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_join1.q b/ql/src/test/queries/clientpositive/temp_table_join1.q
index e77d228..49b8870 100644
--- a/ql/src/test/queries/clientpositive/temp_table_join1.q
+++ b/ql/src/test/queries/clientpositive/temp_table_join1.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/temp_table_precedence.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_precedence.q b/ql/src/test/queries/clientpositive/temp_table_precedence.q
index 971af73..d3f75d4 100644
--- a/ql/src/test/queries/clientpositive/temp_table_precedence.q
+++ b/ql/src/test/queries/clientpositive/temp_table_precedence.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 create database ttp;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/temp_table_subquery1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_subquery1.q b/ql/src/test/queries/clientpositive/temp_table_subquery1.q
index ecf53e9..1bb6972 100644
--- a/ql/src/test/queries/clientpositive/temp_table_subquery1.q
+++ b/ql/src/test/queries/clientpositive/temp_table_subquery1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 create temporary table src_temp as select * from src;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/temp_table_truncate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_truncate.q b/ql/src/test/queries/clientpositive/temp_table_truncate.q
index 7b0fefc..93a54d9 100644
--- a/ql/src/test/queries/clientpositive/temp_table_truncate.q
+++ b/ql/src/test/queries/clientpositive/temp_table_truncate.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 CREATE TEMPORARY TABLE tmp_src AS SELECT * FROM src WHERE key % 2 = 0;
@@ -5,7 +7,7 @@ CREATE TEMPORARY TABLE tmp_srcpart AS SELECT * FROM srcpart;
 
 DESCRIBE tmp_src;
 DESCRIBE tmp_srcpart;
-SHOW TABLES;
+SHOW TABLES LIKE "tmp_src*";
 
 SELECT count(*) FROM tmp_src;
 SELECT count(*) FROM tmp_srcpart;
@@ -18,4 +20,4 @@ SELECT count(*) FROM tmp_src;
 EXPLAIN TRUNCATE TABLE tmp_srcpart;
 TRUNCATE TABLE tmp_srcpart;
 
-SELECT count(*) FROM tmp_srcpart;
\ No newline at end of file
+SELECT count(*) FROM tmp_srcpart;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/test_boolean_whereclause.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/test_boolean_whereclause.q b/ql/src/test/queries/clientpositive/test_boolean_whereclause.q
index a4f0fdb..bf28d29 100644
--- a/ql/src/test/queries/clientpositive/test_boolean_whereclause.q
+++ b/ql/src/test/queries/clientpositive/test_boolean_whereclause.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table if not exists test_boolean(dummy tinyint);
 insert overwrite table test_boolean  select 1 from src tablesample (1 rows);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez-tag.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez-tag.q b/ql/src/test/queries/clientpositive/tez-tag.q
index 0647696..795927f 100644
--- a/ql/src/test/queries/clientpositive/tez-tag.q
+++ b/ql/src/test/queries/clientpositive/tez-tag.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 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/tez_bmj_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
index a286aed..7f0f8d3 100644
--- a/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/tez_bmj_schema_evolution.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 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/tez_dml.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dml.q b/ql/src/test/queries/clientpositive/tez_dml.q
index 816da5d..9eccf36 100644
--- a/ql/src/test/queries/clientpositive/tez_dml.q
+++ b/ql/src/test/queries/clientpositive/tez_dml.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
index aa331f2..8d5b442 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 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/tez_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
index 2c36189..8076593 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 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/tez_dynpart_hashjoin_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
index ff4cde2..d318f7d 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.optimize.limittranspose=true;
 set hive.optimize.limittranspose.reductionpercentage=0.1f;
 set hive.optimize.limittranspose.reductiontuples=100;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_input_counters.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_input_counters.q b/ql/src/test/queries/clientpositive/tez_input_counters.q
index d471c3d..4461966 100644
--- a/ql/src/test/queries/clientpositive/tez_input_counters.q
+++ b/ql/src/test/queries/clientpositive/tez_input_counters.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.compute.query.using.stats=false;
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.max.dynamic.partitions=400;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q b/ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q
index e06403a..c67ac3b 100644
--- a/ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q
+++ b/ql/src/test/queries/clientpositive/tez_insert_overwrite_local_directory_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 insert overwrite local directory '${system:test.tmp.dir}/tez_local_src_table_1'
 select * from src order by key limit 10 ;
 dfs -cat ${system:test.tmp.dir.uri}/tez_local_src_table_1/* ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_join_hash.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_hash.q b/ql/src/test/queries/clientpositive/tez_join_hash.q
index 158c99b..c581895 100644
--- a/ql/src/test/queries/clientpositive/tez_join_hash.q
+++ b/ql/src/test/queries/clientpositive/tez_join_hash.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! 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/tez_join_result_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_result_complex.q b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
index 42c5506..cef8dc7 100644
--- a/ql/src/test/queries/clientpositive/tez_join_result_complex.q
+++ b/ql/src/test/queries/clientpositive/tez_join_result_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.auto.convert.join=true;
 SET hive.auto.convert.join.noconditionaltask=true;
 SET hive.auto.convert.join.noconditionaltask.size=1000000000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_join_tests.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_join_tests.q b/ql/src/test/queries/clientpositive/tez_join_tests.q
index 9a62805..bc57af5 100644
--- a/ql/src/test/queries/clientpositive/tez_join_tests.q
+++ b/ql/src/test/queries/clientpositive/tez_join_tests.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/tez_joins_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_joins_explain.q b/ql/src/test/queries/clientpositive/tez_joins_explain.q
index 5f26ee2..27aac1c 100644
--- a/ql/src/test/queries/clientpositive/tez_joins_explain.q
+++ b/ql/src/test/queries/clientpositive/tez_joins_explain.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/tez_multi_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_multi_union.q b/ql/src/test/queries/clientpositive/tez_multi_union.q
index 9dd3c8d..1798f4a 100644
--- a/ql/src/test/queries/clientpositive/tez_multi_union.q
+++ b/ql/src/test/queries/clientpositive/tez_multi_union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 select key from
 (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
index 1d8f487..62d6601 100644
--- a/ql/src/test/queries/clientpositive/tez_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/tez_schema_evolution.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.vectorized.execution.enabled=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/tez_smb_main.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_smb_main.q b/ql/src/test/queries/clientpositive/tez_smb_main.q
index 7d35571..43b0a5f 100644
--- a/ql/src/test/queries/clientpositive/tez_smb_main.q
+++ b/ql/src/test/queries/clientpositive/tez_smb_main.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.strict.checks.bucketing=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union.q b/ql/src/test/queries/clientpositive/tez_union.q
index fba543c..da21886 100644
--- a/ql/src/test/queries/clientpositive/tez_union.q
+++ b/ql/src/test/queries/clientpositive/tez_union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.compute.query.using.stats=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/tez_union2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union2.q b/ql/src/test/queries/clientpositive/tez_union2.q
index 22eab01..b20f720 100644
--- a/ql/src/test/queries/clientpositive/tez_union2.q
+++ b/ql/src/test/queries/clientpositive/tez_union2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 explain 
 SELECT key, value FROM

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_union_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_decimal.q b/ql/src/test/queries/clientpositive/tez_union_decimal.q
index 0f56e6a..f7093cf 100644
--- a/ql/src/test/queries/clientpositive/tez_union_decimal.q
+++ b/ql/src/test/queries/clientpositive/tez_union_decimal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 select sum(a) from (
   select cast(1.1 as decimal) a from src tablesample (1 rows)
   union all

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_multiinsert.q b/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
index 67a9ac5..e0a24bb 100644
--- a/ql/src/test/queries/clientpositive/tez_union_multiinsert.q
+++ b/ql/src/test/queries/clientpositive/tez_union_multiinsert.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/tez_union_with_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_union_with_udf.q b/ql/src/test/queries/clientpositive/tez_union_with_udf.q
index 6826530..5afa485 100644
--- a/ql/src/test/queries/clientpositive/tez_union_with_udf.q
+++ b/ql/src/test/queries/clientpositive/tez_union_with_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 select * from (select key + key from src limit 1) a
 union all
 select * from (select key + key from src limit 1) b;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
index 04683d2..66e3523 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 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/tez_vector_dynpart_hashjoin_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
index e3d1830..04d6829 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 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/timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp.q b/ql/src/test/queries/clientpositive/timestamp.q
index 4a04080..1453cf8 100644
--- a/ql/src/test/queries/clientpositive/timestamp.q
+++ b/ql/src/test/queries/clientpositive/timestamp.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/timestamp_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_1.q b/ql/src/test/queries/clientpositive/timestamp_1.q
index ce79eef..d5f7d6b 100644
--- a/ql/src/test/queries/clientpositive/timestamp_1.q
+++ b/ql/src/test/queries/clientpositive/timestamp_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 drop table timestamp_1;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/timestamp_comparison.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_comparison.q b/ql/src/test/queries/clientpositive/timestamp_comparison.q
index 30fee3c..7ac2932 100644
--- a/ql/src/test/queries/clientpositive/timestamp_comparison.q
+++ b/ql/src/test/queries/clientpositive/timestamp_comparison.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 select cast('2011-05-06 07:08:09' as timestamp) >

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/timestamp_comparison2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_comparison2.q b/ql/src/test/queries/clientpositive/timestamp_comparison2.q
index d41cc83..affc36f 100644
--- a/ql/src/test/queries/clientpositive/timestamp_comparison2.q
+++ b/ql/src/test/queries/clientpositive/timestamp_comparison2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 -- Test timestamp-to-numeric comparison
 select count(*) 
 FROM   alltypesorc

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/timestamp_ints_casts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_ints_casts.q b/ql/src/test/queries/clientpositive/timestamp_ints_casts.q
index b043d59..e3fd37b 100644
--- a/ql/src/test/queries/clientpositive/timestamp_ints_casts.q
+++ b/ql/src/test/queries/clientpositive/timestamp_ints_casts.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.int.timestamp.conversion.in.seconds=false;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/timestamp_lazy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/timestamp_lazy.q b/ql/src/test/queries/clientpositive/timestamp_lazy.q
index e72d82e..15ab3ec 100644
--- a/ql/src/test/queries/clientpositive/timestamp_lazy.q
+++ b/ql/src/test/queries/clientpositive/timestamp_lazy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 drop table timestamp_lazy;
 create table timestamp_lazy (t timestamp, key string, value string);

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/touch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/touch.q b/ql/src/test/queries/clientpositive/touch.q
index 6686b68..8711b77 100644
--- a/ql/src/test/queries/clientpositive/touch.q
+++ b/ql/src/test/queries/clientpositive/touch.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 create database tc;
 
 create table tc.tstsrc like default.src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/transform1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform1.q b/ql/src/test/queries/clientpositive/transform1.q
index f2d23b9..bb20cbb 100644
--- a/ql/src/test/queries/clientpositive/transform1.q
+++ b/ql/src/test/queries/clientpositive/transform1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set hive.entity.capture.transform=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/transform2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform2.q b/ql/src/test/queries/clientpositive/transform2.q
index ddbc567..3188ab0 100644
--- a/ql/src/test/queries/clientpositive/transform2.q
+++ b/ql/src/test/queries/clientpositive/transform2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- Transform with a function that has many parameters
 SELECT TRANSFORM(substr(key, 1, 2)) USING 'cat' FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/transform_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform_acid.q b/ql/src/test/queries/clientpositive/transform_acid.q
index c890ef8..c55ed43 100644
--- a/ql/src/test/queries/clientpositive/transform_acid.q
+++ b/ql/src/test/queries/clientpositive/transform_acid.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.entity.capture.transform=true;
 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/transform_ppr1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform_ppr1.q b/ql/src/test/queries/clientpositive/transform_ppr1.q
index 5d0a48b..dc7884b 100644
--- a/ql/src/test/queries/clientpositive/transform_ppr1.q
+++ b/ql/src/test/queries/clientpositive/transform_ppr1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
 set hive.entity.capture.transform=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/transform_ppr2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/transform_ppr2.q b/ql/src/test/queries/clientpositive/transform_ppr2.q
index 6dbaca1..51d154a 100644
--- a/ql/src/test/queries/clientpositive/transform_ppr2.q
+++ b/ql/src/test/queries/clientpositive/transform_ppr2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.optimize.ppd=true;
 set hive.entity.capture.transform=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/truncate_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column.q b/ql/src/test/queries/clientpositive/truncate_column.q
index 4cfa180..1e29b55 100644
--- a/ql/src/test/queries/clientpositive/truncate_column.q
+++ b/ql/src/test/queries/clientpositive/truncate_column.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 -- Tests truncating column(s) from a table, also tests that stats are updated
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/truncate_column_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_buckets.q b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
index c51a98f..241bd25 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_buckets.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_buckets.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- Tests truncating columns from a bucketed table, table should remain bucketed
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
index 476120a..44f5806 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 set hive.merge.mapfiles=false;	

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/truncate_column_merge.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/truncate_column_merge.q b/ql/src/test/queries/clientpositive/truncate_column_merge.q
index c11b7f6..fb309b5 100644
--- a/ql/src/test/queries/clientpositive/truncate_column_merge.q
+++ b/ql/src/test/queries/clientpositive/truncate_column_merge.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- Tests truncating a column from a table with multiple files, then merging those files
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/type_cast_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/type_cast_1.q b/ql/src/test/queries/clientpositive/type_cast_1.q
index 4d1d978..5c4bf54 100644
--- a/ql/src/test/queries/clientpositive/type_cast_1.q
+++ b/ql/src/test/queries/clientpositive/type_cast_1.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/type_conversions_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/type_conversions_1.q b/ql/src/test/queries/clientpositive/type_conversions_1.q
index 4c4a828..7d138c9 100644
--- a/ql/src/test/queries/clientpositive/type_conversions_1.q
+++ b/ql/src/test/queries/clientpositive/type_conversions_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- casting from null should yield null

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/type_widening.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/type_widening.q b/ql/src/test/queries/clientpositive/type_widening.q
index ab4720c..dba7be5 100644
--- a/ql/src/test/queries/clientpositive/type_widening.q
+++ b/ql/src/test/queries/clientpositive/type_widening.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 -- Check for int, bigint automatic type widening conversions in UDFs, UNIONS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_all_keyword.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_all_keyword.q b/ql/src/test/queries/clientpositive/udaf_all_keyword.q
index e542621..7aef21a 100644
--- a/ql/src/test/queries/clientpositive/udaf_all_keyword.q
+++ b/ql/src/test/queries/clientpositive/udaf_all_keyword.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- following tests are to test ALL quantifier (HIVE-16064)
 
 -- count

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_collect_set.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_collect_set.q b/ql/src/test/queries/clientpositive/udaf_collect_set.q
index 04bea32..f9de904 100644
--- a/ql/src/test/queries/clientpositive/udaf_collect_set.q
+++ b/ql/src/test/queries/clientpositive/udaf_collect_set.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION collect_set;
 DESCRIBE FUNCTION EXTENDED collect_set;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_histogram_numeric.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_histogram_numeric.q b/ql/src/test/queries/clientpositive/udaf_histogram_numeric.q
index 18bcd1c..c1f67fd 100644
--- a/ql/src/test/queries/clientpositive/udaf_histogram_numeric.q
+++ b/ql/src/test/queries/clientpositive/udaf_histogram_numeric.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 SELECT histogram_numeric(cast(substr(src.value,5) AS double), 2) FROM src;
 SELECT histogram_numeric(cast(substr(src.value,5) AS double), 3) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_number_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_number_format.q b/ql/src/test/queries/clientpositive/udaf_number_format.q
index 4f2ab45..a8613aa 100644
--- a/ql/src/test/queries/clientpositive/udaf_number_format.q
+++ b/ql/src/test/queries/clientpositive/udaf_number_format.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 EXPLAIN SELECT
   sum('a'),

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_percentile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_percentile.q b/ql/src/test/queries/clientpositive/udaf_percentile.q
index 8ebf01d..7a5a379 100644
--- a/ql/src/test/queries/clientpositive/udaf_percentile.q
+++ b/ql/src/test/queries/clientpositive/udaf_percentile.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select percentile(cast(key as bigint), 0.3) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udaf_sum_list.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_sum_list.q b/ql/src/test/queries/clientpositive/udaf_sum_list.q
index 0d86a42..7156b62 100644
--- a/ql/src/test/queries/clientpositive/udaf_sum_list.q
+++ b/ql/src/test/queries/clientpositive/udaf_sum_list.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- HIVE-5279
 -- GenericUDAFSumList has Converter which does not have default constructor
 -- After

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf1.q b/ql/src/test/queries/clientpositive/udf1.q
index 9df913d..b054eb3 100644
--- a/ql/src/test/queries/clientpositive/udf1.q
+++ b/ql/src/test/queries/clientpositive/udf1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING,
   c5 STRING, c6 STRING, c7 STRING, c8 STRING,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf2.q b/ql/src/test/queries/clientpositive/udf2.q
index 5aa99e8..aef7717 100644
--- a/ql/src/test/queries/clientpositive/udf2.q
+++ b/ql/src/test/queries/clientpositive/udf2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '  abc  ' WHERE src.key = 86;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf4.q b/ql/src/test/queries/clientpositive/udf4.q
index 16f5b2c..164f858 100644
--- a/ql/src/test/queries/clientpositive/udf4.q
+++ b/ql/src/test/queries/clientpositive/udf4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '  abc  ' WHERE src.key = 86;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf5.q b/ql/src/test/queries/clientpositive/udf5.q
index 782e23d..1a46ca7 100644
--- a/ql/src/test/queries/clientpositive/udf5.q
+++ b/ql/src/test/queries/clientpositive/udf5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '  abc  ' WHERE src.key = 86;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf6.q b/ql/src/test/queries/clientpositive/udf6.q
index fd540d6..9f7afec 100644
--- a/ql/src/test/queries/clientpositive/udf6.q
+++ b/ql/src/test/queries/clientpositive/udf6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '  abc  ' WHERE src.key = 86;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf7.q b/ql/src/test/queries/clientpositive/udf7.q
index d12394e..c9724e5 100644
--- a/ql/src/test/queries/clientpositive/udf7.q
+++ b/ql/src/test/queries/clientpositive/udf7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '  abc  ' WHERE src.key = 86;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf8.q b/ql/src/test/queries/clientpositive/udf8.q
index a9e6963..dad92db 100644
--- a/ql/src/test/queries/clientpositive/udf8.q
+++ b/ql/src/test/queries/clientpositive/udf8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c1 STRING) STORED AS TEXTFILE;
 
 FROM src INSERT OVERWRITE TABLE dest1 SELECT '' WHERE src.key = 86;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf9.q b/ql/src/test/queries/clientpositive/udf9.q
index 6e76f52..f37e0c3 100644
--- a/ql/src/test/queries/clientpositive/udf9.q
+++ b/ql/src/test/queries/clientpositive/udf9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT DATEDIFF('2008-12-31', '2009-01-01'), DATEDIFF('2008-03-01', '2008-02-28'),

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_E.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_E.q b/ql/src/test/queries/clientpositive/udf_E.q
index 41bdec0..dd1fc37 100644
--- a/ql/src/test/queries/clientpositive/udf_E.q
+++ b/ql/src/test/queries/clientpositive/udf_E.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/udf_PI.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_PI.q b/ql/src/test/queries/clientpositive/udf_PI.q
index 945483e..5735b21 100644
--- a/ql/src/test/queries/clientpositive/udf_PI.q
+++ b/ql/src/test/queries/clientpositive/udf_PI.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/udf_abs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_abs.q b/ql/src/test/queries/clientpositive/udf_abs.q
index 0c06a5b..c7832ea 100644
--- a/ql/src/test/queries/clientpositive/udf_abs.q
+++ b/ql/src/test/queries/clientpositive/udf_abs.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION abs;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_acos.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_acos.q b/ql/src/test/queries/clientpositive/udf_acos.q
index f9adc16..d5ffa01 100644
--- a/ql/src/test/queries/clientpositive/udf_acos.q
+++ b/ql/src/test/queries/clientpositive/udf_acos.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION acos;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_array.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_array.q b/ql/src/test/queries/clientpositive/udf_array.q
index 5a6a183..3d1dc65 100644
--- a/ql/src/test/queries/clientpositive/udf_array.q
+++ b/ql/src/test/queries/clientpositive/udf_array.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION array;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_array_contains.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_array_contains.q b/ql/src/test/queries/clientpositive/udf_array_contains.q
index d2dad64..a7396d0 100644
--- a/ql/src/test/queries/clientpositive/udf_array_contains.q
+++ b/ql/src/test/queries/clientpositive/udf_array_contains.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION array_contains;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_ascii.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_ascii.q b/ql/src/test/queries/clientpositive/udf_ascii.q
index 3d885a2..04fa008 100644
--- a/ql/src/test/queries/clientpositive/udf_ascii.q
+++ b/ql/src/test/queries/clientpositive/udf_ascii.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION ascii;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_asin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_asin.q b/ql/src/test/queries/clientpositive/udf_asin.q
index 73b77d1..54b85b7 100644
--- a/ql/src/test/queries/clientpositive/udf_asin.q
+++ b/ql/src/test/queries/clientpositive/udf_asin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION asin;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_atan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_atan.q b/ql/src/test/queries/clientpositive/udf_atan.q
index 090438c..4098049 100644
--- a/ql/src/test/queries/clientpositive/udf_atan.q
+++ b/ql/src/test/queries/clientpositive/udf_atan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION atan;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_between.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_between.q b/ql/src/test/queries/clientpositive/udf_between.q
index cba8d31..9ee3352 100644
--- a/ql/src/test/queries/clientpositive/udf_between.q
+++ b/ql/src/test/queries/clientpositive/udf_between.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_bin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_bin.q b/ql/src/test/queries/clientpositive/udf_bin.q
index c5a7ac1..a84a351 100644
--- a/ql/src/test/queries/clientpositive/udf_bin.q
+++ b/ql/src/test/queries/clientpositive/udf_bin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION bin;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_case.q b/ql/src/test/queries/clientpositive/udf_case.q
index 43573bf..28d87a8 100644
--- a/ql/src/test/queries/clientpositive/udf_case.q
+++ b/ql/src/test/queries/clientpositive/udf_case.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION case;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
index d6c9e9d..cf53ac2 100644
--- a/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/udf_case_column_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT CASE a.key

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