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:53 UTC

[09/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/mapjoin_test_outer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_test_outer.q b/ql/src/test/queries/clientpositive/mapjoin_test_outer.q
index e2998d7..96275ab 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_test_outer.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_test_outer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.auto.convert.join = false;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapreduce1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapreduce1.q b/ql/src/test/queries/clientpositive/mapreduce1.q
index e2b314f..06c7c53 100644
--- a/ql/src/test/queries/clientpositive/mapreduce1.q
+++ b/ql/src/test/queries/clientpositive/mapreduce1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
 

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapreduce7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapreduce7.q b/ql/src/test/queries/clientpositive/mapreduce7.q
index 0da41d2..77b82ef 100644
--- a/ql/src/test/queries/clientpositive/mapreduce7.q
+++ b/ql/src/test/queries/clientpositive/mapreduce7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapreduce8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapreduce8.q b/ql/src/test/queries/clientpositive/mapreduce8.q
index 35d9ed9..7db7510 100644
--- a/ql/src/test/queries/clientpositive/mapreduce8.q
+++ b/ql/src/test/queries/clientpositive/mapreduce8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(k STRING, v STRING, key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_1.q b/ql/src/test/queries/clientpositive/masking_1.q
index 90f009d..6e4f6a7 100644
--- a/ql/src/test/queries/clientpositive/masking_1.q
+++ b/ql/src/test/queries/clientpositive/masking_1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_10.q b/ql/src/test/queries/clientpositive/masking_10.q
index e933253..a26d2de 100644
--- a/ql/src/test/queries/clientpositive/masking_10.q
+++ b/ql/src/test/queries/clientpositive/masking_10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_11.q b/ql/src/test/queries/clientpositive/masking_11.q
index dc46117..53a90cd 100644
--- a/ql/src/test/queries/clientpositive/masking_11.q
+++ b/ql/src/test/queries/clientpositive/masking_11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_12.q b/ql/src/test/queries/clientpositive/masking_12.q
index cf12da9..707d53a 100644
--- a/ql/src/test/queries/clientpositive/masking_12.q
+++ b/ql/src/test/queries/clientpositive/masking_12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_1_newdb.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_1_newdb.q b/ql/src/test/queries/clientpositive/masking_1_newdb.q
index 42c33dc..7438349 100644
--- a/ql/src/test/queries/clientpositive/masking_1_newdb.q
+++ b/ql/src/test/queries/clientpositive/masking_1_newdb.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_2.q b/ql/src/test/queries/clientpositive/masking_2.q
index fc4a71e..3192992 100644
--- a/ql/src/test/queries/clientpositive/masking_2.q
+++ b/ql/src/test/queries/clientpositive/masking_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_3.q b/ql/src/test/queries/clientpositive/masking_3.q
index 584dac1..018f998 100644
--- a/ql/src/test/queries/clientpositive/masking_3.q
+++ b/ql/src/test/queries/clientpositive/masking_3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_4.q b/ql/src/test/queries/clientpositive/masking_4.q
index 04dd185..49af1cc 100644
--- a/ql/src/test/queries/clientpositive/masking_4.q
+++ b/ql/src/test/queries/clientpositive/masking_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_5.q b/ql/src/test/queries/clientpositive/masking_5.q
index a2f7d18..e8f392f 100644
--- a/ql/src/test/queries/clientpositive/masking_5.q
+++ b/ql/src/test/queries/clientpositive/masking_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_6.q b/ql/src/test/queries/clientpositive/masking_6.q
index e266741..f773ec1 100644
--- a/ql/src/test/queries/clientpositive/masking_6.q
+++ b/ql/src/test/queries/clientpositive/masking_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_7.q b/ql/src/test/queries/clientpositive/masking_7.q
index 6d4784d..1655221 100644
--- a/ql/src/test/queries/clientpositive/masking_7.q
+++ b/ql/src/test/queries/clientpositive/masking_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_8.q b/ql/src/test/queries/clientpositive/masking_8.q
index d9a01af..2db0652 100644
--- a/ql/src/test/queries/clientpositive/masking_8.q
+++ b/ql/src/test/queries/clientpositive/masking_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_9.q b/ql/src/test/queries/clientpositive/masking_9.q
index c8b54ce..a67b63d 100644
--- a/ql/src/test/queries/clientpositive/masking_9.q
+++ b/ql/src/test/queries/clientpositive/masking_9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_disablecbo_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_disablecbo_1.q b/ql/src/test/queries/clientpositive/masking_disablecbo_1.q
index 8fefbcf..aaf17e0 100644
--- a/ql/src/test/queries/clientpositive/masking_disablecbo_1.q
+++ b/ql/src/test/queries/clientpositive/masking_disablecbo_1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.cbo.enable=false;
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_disablecbo_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_disablecbo_2.q b/ql/src/test/queries/clientpositive/masking_disablecbo_2.q
index 8375c52..039ffe9 100644
--- a/ql/src/test/queries/clientpositive/masking_disablecbo_2.q
+++ b/ql/src/test/queries/clientpositive/masking_disablecbo_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_disablecbo_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_disablecbo_3.q b/ql/src/test/queries/clientpositive/masking_disablecbo_3.q
index 9501edd..88ee96b 100644
--- a/ql/src/test/queries/clientpositive/masking_disablecbo_3.q
+++ b/ql/src/test/queries/clientpositive/masking_disablecbo_3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.cbo.enable=false;
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/masking_disablecbo_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/masking_disablecbo_4.q b/ql/src/test/queries/clientpositive/masking_disablecbo_4.q
index 7279114..9981969 100644
--- a/ql/src/test/queries/clientpositive/masking_disablecbo_4.q
+++ b/ql/src/test/queries/clientpositive/masking_disablecbo_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/materialized_view_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_drop.q b/ql/src/test/queries/clientpositive/materialized_view_drop.q
index 8897159..39d6358 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_drop.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_drop.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 create materialized view dmv_mat_view as select cint, cstring1 from alltypesorc where cint < 0;
 
 show table extended like dmv_mat_view;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
index 0177188..ef85acb 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.strict.checks.cartesian.product=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
index 7c4d119..d3914be 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_rewrite_ssb_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.strict.checks.cartesian.product=false;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge3.q b/ql/src/test/queries/clientpositive/merge3.q
index 98b15d5..2b8af62 100644
--- a/ql/src/test/queries/clientpositive/merge3.q
+++ b/ql/src/test/queries/clientpositive/merge3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge4.q b/ql/src/test/queries/clientpositive/merge4.q
index 14aca1a..6bcbe52 100644
--- a/ql/src/test/queries/clientpositive/merge4.q
+++ b/ql/src/test/queries/clientpositive/merge4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.merge.mapfiles=true;
 set hive.merge.mapredfiles=true;

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/merge_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/merge_empty.q b/ql/src/test/queries/clientpositive/merge_empty.q
index 188b39e..83c44b5 100644
--- a/ql/src/test/queries/clientpositive/merge_empty.q
+++ b/ql/src/test/queries/clientpositive/merge_empty.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.merge.mapredfiles=true;
 set hive.merge.sparkfiles=true;
 set hive.auto.convert.join=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mergejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoin.q b/ql/src/test/queries/clientpositive/mergejoin.q
index 534f24c..058588c 100644
--- a/ql/src/test/queries/clientpositive/mergejoin.q
+++ b/ql/src/test/queries/clientpositive/mergejoin.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/mergejoin_3way.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoin_3way.q b/ql/src/test/queries/clientpositive/mergejoin_3way.q
index 4c50f1d..74fb887 100644
--- a/ql/src/test/queries/clientpositive/mergejoin_3way.q
+++ b/ql/src/test/queries/clientpositive/mergejoin_3way.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.auto.convert.join=false;
 set hive.cbo.enable=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mergejoins.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoins.q b/ql/src/test/queries/clientpositive/mergejoins.q
index 2c11b3a..2b1ecba 100644
--- a/ql/src/test/queries/clientpositive/mergejoins.q
+++ b/ql/src/test/queries/clientpositive/mergejoins.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table a (val1 int, val2 int);
 create table b (val1 int, val2 int);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
index 77fa654..bafdd58 100644
--- a/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
+++ b/ql/src/test/queries/clientpositive/metadataOnlyOptimizer.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 select key from(
 select '1' as key from srcpart where ds="2008-04-09"

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/metadataonly1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/metadataonly1.q b/ql/src/test/queries/clientpositive/metadataonly1.q
index 409109a..e3bf819 100644
--- a/ql/src/test/queries/clientpositive/metadataonly1.q
+++ b/ql/src/test/queries/clientpositive/metadataonly1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.optimize.metadataonly=true;
 CREATE TABLE TEST1(A INT, B DOUBLE) partitioned by (ds string);

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mm_all.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mm_all.q b/ql/src/test/queries/clientpositive/mm_all.q
index b93e13e..4ffbb6b 100644
--- a/ql/src/test/queries/clientpositive/mm_all.q
+++ b/ql/src/test/queries/clientpositive/mm_all.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mm_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mm_buckets.q b/ql/src/test/queries/clientpositive/mm_buckets.q
index d5a047a..3e91cdd 100644
--- a/ql/src/test/queries/clientpositive/mm_buckets.q
+++ b/ql/src/test/queries/clientpositive/mm_buckets.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mm_conversions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mm_conversions.q b/ql/src/test/queries/clientpositive/mm_conversions.q
index 14d16ab..55565a9 100644
--- a/ql/src/test/queries/clientpositive/mm_conversions.q
+++ b/ql/src/test/queries/clientpositive/mm_conversions.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mm_exim.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mm_exim.q b/ql/src/test/queries/clientpositive/mm_exim.q
index d084125..c47342b 100644
--- a/ql/src/test/queries/clientpositive/mm_exim.q
+++ b/ql/src/test/queries/clientpositive/mm_exim.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multiMapJoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin1.q b/ql/src/test/queries/clientpositive/multiMapJoin1.q
index 6e16af4..a65ed72 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin1.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 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/multiMapJoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multiMapJoin2.q b/ql/src/test/queries/clientpositive/multiMapJoin2.q
index 14b2eda..efaadcb 100644
--- a/ql/src/test/queries/clientpositive/multiMapJoin2.q
+++ b/ql/src/test/queries/clientpositive/multiMapJoin2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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;
 set hive.auto.convert.join=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_column_in_single.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_column_in_single.q b/ql/src/test/queries/clientpositive/multi_column_in_single.q
index ca2d16c..7151fc4 100644
--- a/ql/src/test/queries/clientpositive/multi_column_in_single.q
+++ b/ql/src/test/queries/clientpositive/multi_column_in_single.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 select * from src where (key, value) in (('238','val_238'));

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert.q b/ql/src/test/queries/clientpositive/multi_insert.q
index 1fdfa59..9e33a84 100644
--- a/ql/src/test/queries/clientpositive/multi_insert.q
+++ b/ql/src/test/queries/clientpositive/multi_insert.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 create table src_multi1 like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby.q b/ql/src/test/queries/clientpositive/multi_insert_gby.q
index 2d5a312..7c9e8de 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_gby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby2.q b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
index c23c854..a477f83 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby2.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 --HIVE-3699 Multiple insert overwrite into multiple tables query stores same results in all tables
 create table e1 (count int);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_gby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby3.q b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
index 68f6644..6bed476 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby3.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 create table e1 (key string, keyD double);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_gby4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_gby4.q b/ql/src/test/queries/clientpositive/multi_insert_gby4.q
index 2e22096..d485813 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_gby4.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_gby4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 create table e1 (key string, count int);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q b/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
index d80717f..481bdf2 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.dbclass=fs;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_mixed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_mixed.q b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
index 7be6d13..a5c1e87 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_mixed.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_mixed.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table src_multi1 like src;
 create table src_multi2 like src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q b/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
index 3ddaa47..670211c 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.multi.insert.move.tasks.share.dependencies=true;
 set hive.stats.dbclass=fs;
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/multi_insert_union_src.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/multi_insert_union_src.q b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
index 51b4695..ae4c8d4 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_union_src.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_union_src.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 drop table if exists src2;
 drop table if exists src_multi1;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/newline.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/newline.q b/ql/src/test/queries/clientpositive/newline.q
index e7dcb62..584ff98 100644
--- a/ql/src/test/queries/clientpositive/newline.q
+++ b/ql/src/test/queries/clientpositive/newline.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 add file ../../data/scripts/newline.py;
 set hive.transform.escape.input=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/no_hooks.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/no_hooks.q b/ql/src/test/queries/clientpositive/no_hooks.q
index 7e80a9d..6191743 100644
--- a/ql/src/test/queries/clientpositive/no_hooks.q
+++ b/ql/src/test/queries/clientpositive/no_hooks.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.pre.hooks=;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/noalias_subq1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/noalias_subq1.q b/ql/src/test/queries/clientpositive/noalias_subq1.q
index cf49301..c346f7e 100644
--- a/ql/src/test/queries/clientpositive/noalias_subq1.q
+++ b/ql/src/test/queries/clientpositive/noalias_subq1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT c1 FROM (select value as c1, key as c2 from src) x where c2 < 100;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/nomore_ambiguous_table_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nomore_ambiguous_table_col.q b/ql/src/test/queries/clientpositive/nomore_ambiguous_table_col.q
index 6795475..77b782c 100644
--- a/ql/src/test/queries/clientpositive/nomore_ambiguous_table_col.q
+++ b/ql/src/test/queries/clientpositive/nomore_ambiguous_table_col.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- was negative/ambiguous_table_col.q
 
 drop table ambiguous;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/non_ascii_literal1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/non_ascii_literal1.q b/ql/src/test/queries/clientpositive/non_ascii_literal1.q
index 9573653..ae6d16b 100644
--- a/ql/src/test/queries/clientpositive/non_ascii_literal1.q
+++ b/ql/src/test/queries/clientpositive/non_ascii_literal1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select concat("Абвгде", "谢谢") from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/non_native_window_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/non_native_window_udf.q b/ql/src/test/queries/clientpositive/non_native_window_udf.q
index c3b8845..1a49398 100644
--- a/ql/src/test/queries/clientpositive/non_native_window_udf.q
+++ b/ql/src/test/queries/clientpositive/non_native_window_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 
 create temporary function mylastval as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFLastValue';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
index 77dee5a..677b4c9 100644
--- a/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.q
+++ b/ql/src/test/queries/clientpositive/nonblock_op_deduplicate.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/nonmr_fetch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch.q b/ql/src/test/queries/clientpositive/nonmr_fetch.q
index dffdc2c..1b5ab56 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=minimal;
 set hive.exec.submitviachild=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
index ddb9d82..6cc4543 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 set hive.explain.user=true;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/nonreserved_keywords_insert_into1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nonreserved_keywords_insert_into1.q b/ql/src/test/queries/clientpositive/nonreserved_keywords_insert_into1.q
index 5393664..c273941 100644
--- a/ql/src/test/queries/clientpositive/nonreserved_keywords_insert_into1.q
+++ b/ql/src/test/queries/clientpositive/nonreserved_keywords_insert_into1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE `insert`;
 
 CREATE TABLE `insert` (key INT, `as` STRING);

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/notable_alias3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/notable_alias3.q b/ql/src/test/queries/clientpositive/notable_alias3.q
index aa79674..9cb7605 100644
--- a/ql/src/test/queries/clientpositive/notable_alias3.q
+++ b/ql/src/test/queries/clientpositive/notable_alias3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(c string, key INT, value DOUBLE) STORED AS TEXTFILE;
 
 FROM src

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/null_cast.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/null_cast.q b/ql/src/test/queries/clientpositive/null_cast.q
index bd0cb8d..a2b734a 100644
--- a/ql/src/test/queries/clientpositive/null_cast.q
+++ b/ql/src/test/queries/clientpositive/null_cast.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN SELECT ARRAY(NULL, 0), 
                ARRAY(NULL, ARRAY()),
                ARRAY(NULL, MAP()),

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/nullgroup4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/nullgroup4.q b/ql/src/test/queries/clientpositive/nullgroup4.q
index 61b0f2c..7b75d59 100644
--- a/ql/src/test/queries/clientpositive/nullgroup4.q
+++ b/ql/src/test/queries/clientpositive/nullgroup4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
 set hive.groupby.skewindata=true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/num_op_type_conv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/num_op_type_conv.q b/ql/src/test/queries/clientpositive/num_op_type_conv.q
index d51c210..086a760 100644
--- a/ql/src/test/queries/clientpositive/num_op_type_conv.q
+++ b/ql/src/test/queries/clientpositive/num_op_type_conv.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN SELECT null + 7, 1.0 - null, null + null,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/offset_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/offset_limit.q b/ql/src/test/queries/clientpositive/offset_limit.q
index 8f50f30..eb97bcf 100644
--- a/ql/src/test/queries/clientpositive/offset_limit.q
+++ b/ql/src/test/queries/clientpositive/offset_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT src.key, sum(substr(src.value,5)) FROM src GROUP BY src.key ORDER BY src.key LIMIT 10,10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/offset_limit_global_optimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/offset_limit_global_optimizer.q b/ql/src/test/queries/clientpositive/offset_limit_global_optimizer.q
index 8e08fbd..350aa55 100644
--- a/ql/src/test/queries/clientpositive/offset_limit_global_optimizer.q
+++ b/ql/src/test/queries/clientpositive/offset_limit_global_optimizer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.limit.optimize.enable=true;
 set hive.limit.row.max.size=12;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q b/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
index 4e05868..1a600e3 100644
--- a/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
+++ b/ql/src/test/queries/clientpositive/offset_limit_ppd_optimizer.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.explain.user=false;
 set hive.limit.pushdown.memory.usage=0.3f;
 set hive.optimize.reducededuplication.min.reducer=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ops_comparison.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ops_comparison.q b/ql/src/test/queries/clientpositive/ops_comparison.q
index ec9e807..76b7ee0 100644
--- a/ql/src/test/queries/clientpositive/ops_comparison.q
+++ b/ql/src/test/queries/clientpositive/ops_comparison.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 select 1.0 < 2.0 from src limit 1;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/optional_outer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/optional_outer.q b/ql/src/test/queries/clientpositive/optional_outer.q
index 518e9c5..e12a8ac 100644
--- a/ql/src/test/queries/clientpositive/optional_outer.q
+++ b/ql/src/test/queries/clientpositive/optional_outer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 EXPLAIN SELECT * FROM src a LEFT OUTER JOIN src b on (a.key=b.key);
 EXPLAIN SELECT * FROM src a LEFT JOIN src b on (a.key=b.key);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q b/ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q
index 47ac526..ab484ce 100644
--- a/ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q
+++ b/ql/src/test/queries/clientpositive/orc_avro_partition_uniontype.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.exec.schema.evolution = false;
 
 CREATE TABLE avro_orc_partitioned_uniontype (a uniontype<boolean, string>) PARTITIONED BY (b int) STORED AS ORC;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_create.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_create.q b/ql/src/test/queries/clientpositive/orc_create.q
index 0647200..ec0f700 100644
--- a/ql/src/test/queries/clientpositive/orc_create.q
+++ b/ql/src/test/queries/clientpositive/orc_create.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/orc_createas1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_createas1.q b/ql/src/test/queries/clientpositive/orc_createas1.q
index b39d65d..ee7881c 100644
--- a/ql/src/test/queries/clientpositive/orc_createas1.q
+++ b/ql/src/test/queries/clientpositive/orc_createas1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set mapred.max.split.size=100;
 set mapred.min.split.size=1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q b/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
index a0eaab7..de7b4a4 100644
--- a/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
+++ b/ql/src/test/queries/clientpositive/orc_dictionary_threshold.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.orc.dictionary.key.size.threshold=-1;
 
 -- Set the threshold to -1 to guarantee dictionary encoding is turned off

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_diff_part_cols2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_diff_part_cols2.q b/ql/src/test/queries/clientpositive/orc_diff_part_cols2.q
index 3fe42bb..ce86e5d 100644
--- a/ql/src/test/queries/clientpositive/orc_diff_part_cols2.q
+++ b/ql/src/test/queries/clientpositive/orc_diff_part_cols2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Create a table with one column, write to it, then add an additional column
 -- This can break reads
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_empty_files.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_empty_files.q b/ql/src/test/queries/clientpositive/orc_empty_files.q
index dd0e81a..11e8c23 100644
--- a/ql/src/test/queries/clientpositive/orc_empty_files.q
+++ b/ql/src/test/queries/clientpositive/orc_empty_files.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE test_orc (key STRING, cnt INT)
 CLUSTERED BY (key) INTO 3 BUCKETS
 ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.orc.OrcSerde' 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
index 9be46f0..aa373a0 100644
--- a/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
+++ b/ql/src/test/queries/clientpositive/orc_int_type_promotion.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 create table if not exists alltypes (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_llap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_llap.q b/ql/src/test/queries/clientpositive/orc_llap.q
index 7b7f240..7a41a20 100644
--- a/ql/src/test/queries/clientpositive/orc_llap.q
+++ b/ql/src/test/queries/clientpositive/orc_llap.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_llap_nonvector.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_llap_nonvector.q b/ql/src/test/queries/clientpositive/orc_llap_nonvector.q
index 1fc60b2..5616769 100644
--- a/ql/src/test/queries/clientpositive/orc_llap_nonvector.q
+++ b/ql/src/test/queries/clientpositive/orc_llap_nonvector.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 SET hive.vectorized.execution.enabled=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge1.q b/ql/src/test/queries/clientpositive/orc_merge1.q
index f704a1c..1f1af37 100644
--- a/ql/src/test/queries/clientpositive/orc_merge1.q
+++ b/ql/src/test/queries/clientpositive/orc_merge1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 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/orc_merge10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge10.q b/ql/src/test/queries/clientpositive/orc_merge10.q
index b84ed80..263f478 100644
--- a/ql/src/test/queries/clientpositive/orc_merge10.q
+++ b/ql/src/test/queries/clientpositive/orc_merge10.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 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/orc_merge13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge13.q b/ql/src/test/queries/clientpositive/orc_merge13.q
index 8f013a0..ff98b64 100644
--- a/ql/src/test/queries/clientpositive/orc_merge13.q
+++ b/ql/src/test/queries/clientpositive/orc_merge13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 drop table aa;
 create table aa (a string, b int) stored as orc;
 insert into table aa values("b",2);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge2.q b/ql/src/test/queries/clientpositive/orc_merge2.q
index 667e878..3253c44 100644
--- a/ql/src/test/queries/clientpositive/orc_merge2.q
+++ b/ql/src/test/queries/clientpositive/orc_merge2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge3.q b/ql/src/test/queries/clientpositive/orc_merge3.q
index d5230b1..3ab1bd6 100644
--- a/ql/src/test/queries/clientpositive/orc_merge3.q
+++ b/ql/src/test/queries/clientpositive/orc_merge3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge4.q b/ql/src/test/queries/clientpositive/orc_merge4.q
index 0f91641..ca9335c 100644
--- a/ql/src/test/queries/clientpositive/orc_merge4.q
+++ b/ql/src/test/queries/clientpositive/orc_merge4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.merge.orcfile.stripe.level=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge9.q b/ql/src/test/queries/clientpositive/orc_merge9.q
index 5f387ba..3ac7ff7 100644
--- a/ql/src/test/queries/clientpositive/orc_merge9.q
+++ b/ql/src/test/queries/clientpositive/orc_merge9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 create table ts_merge (
 userid bigint,
 string1 string,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
index 94c0e6a..8dd9f74 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_diff_fs.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 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/orc_merge_incompat3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_incompat3.q b/ql/src/test/queries/clientpositive/orc_merge_incompat3.q
index d6be111..562f998 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_incompat3.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_incompat3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 create table concat_incompat like alltypesorc;
 
 load data local inpath '../../data/files/alltypesorc' into table concat_incompat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q b/ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q
index 5e188f7..5febb3b 100644
--- a/ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q
+++ b/ql/src/test/queries/clientpositive/orc_merge_incompat_writer_version.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 DROP TABLE part_orc;
 CREATE TABLE part_orc(
   p_partkey int,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_mr_pathalias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_mr_pathalias.q b/ql/src/test/queries/clientpositive/orc_mr_pathalias.q
index b92bb9c..ded6f25 100644
--- a/ql/src/test/queries/clientpositive/orc_mr_pathalias.q
+++ b/ql/src/test/queries/clientpositive/orc_mr_pathalias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create database if not exists test;
 drop table if exists test.test_orc_src;
 drop table if exists test.test_orc_src2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_null_check.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_null_check.q b/ql/src/test/queries/clientpositive/orc_null_check.q
index e5453fc..85b4372 100644
--- a/ql/src/test/queries/clientpositive/orc_null_check.q
+++ b/ql/src/test/queries/clientpositive/orc_null_check.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.vectorized.execution.enabled=false;
 
 create table listtable(l array<string>);
@@ -7,4 +8,3 @@ insert overwrite table listtable select array(null) from src;
 insert overwrite table listtable_orc select * from listtable;
 
 select size(l) from listtable_orc limit 10;
-

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_basic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_basic.q b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
index 1c9e4dd..dfd89a7 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_basic.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_basic.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 SET hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_boolean.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_boolean.q b/ql/src/test/queries/clientpositive/orc_ppd_boolean.q
index d344714..7565071 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_boolean.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_boolean.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_char.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_char.q b/ql/src/test/queries/clientpositive/orc_ppd_char.q
index 5c34d04..48cbcf7 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_char.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_char.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_date.q b/ql/src/test/queries/clientpositive/orc_ppd_date.q
index 3d21d41..2252b02 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_date.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_date.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_decimal.q b/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
index a54b862..91faa19 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_decimal.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_is_null.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_is_null.q b/ql/src/test/queries/clientpositive/orc_ppd_is_null.q
index 862a961..241f4d0 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_is_null.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_is_null.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_timestamp.q b/ql/src/test/queries/clientpositive/orc_ppd_timestamp.q
index dafd6cf..062b5be 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_timestamp.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_timestamp.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_ppd_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_ppd_varchar.q b/ql/src/test/queries/clientpositive/orc_ppd_varchar.q
index 0fecc66..e17f547 100644
--- a/ql/src/test/queries/clientpositive/orc_ppd_varchar.q
+++ b/ql/src/test/queries/clientpositive/orc_ppd_varchar.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_remove_cols.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_remove_cols.q b/ql/src/test/queries/clientpositive/orc_remove_cols.q
index c3c95f3..fe7cc74 100644
--- a/ql/src/test/queries/clientpositive/orc_remove_cols.q
+++ b/ql/src/test/queries/clientpositive/orc_remove_cols.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 SET hive.exec.schema.evolution=false;
 set hive.fetch.task.conversion=more;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_schema_evolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_schema_evolution.q b/ql/src/test/queries/clientpositive/orc_schema_evolution.q
index aa6fc58..639dbb9 100644
--- a/ql/src/test/queries/clientpositive/orc_schema_evolution.q
+++ b/ql/src/test/queries/clientpositive/orc_schema_evolution.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=none;
 SET hive.exec.schema.evolution=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q b/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
index 1760813..cc3a7ab 100644
--- a/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
+++ b/ql/src/test/queries/clientpositive/orc_vectorization_ppd.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- create table with 1000 rows
 create table srcorc(key string, value string) stored as textfile;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/order.q b/ql/src/test/queries/clientpositive/order.q
index d389892..9a0c2eb 100644
--- a/ql/src/test/queries/clientpositive/order.q
+++ b/ql/src/test/queries/clientpositive/order.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 SELECT x.* FROM SRC x ORDER BY key limit 10;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/order2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/order2.q b/ql/src/test/queries/clientpositive/order2.q
index 504589a..57615ac 100644
--- a/ql/src/test/queries/clientpositive/order2.q
+++ b/ql/src/test/queries/clientpositive/order2.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/order_within_subquery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/order_within_subquery.q b/ql/src/test/queries/clientpositive/order_within_subquery.q
index daac4a6..c51165c 100644
--- a/ql/src/test/queries/clientpositive/order_within_subquery.q
+++ b/ql/src/test/queries/clientpositive/order_within_subquery.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select t1.p_name, t2.p_name 
 from (select * from part order by p_size limit 10) t1 join part t2 on t1.p_partkey = t2.p_partkey and t1.p_size = t2.p_size 
 where t1.p_partkey < 100000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/outer_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/outer_join_ppr.q b/ql/src/test/queries/clientpositive/outer_join_ppr.q
index 60a06ae..1063a52 100644
--- a/ql/src/test/queries/clientpositive/outer_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/outer_join_ppr.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! 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/overridden_confs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/overridden_confs.q b/ql/src/test/queries/clientpositive/overridden_confs.q
index c7e0551..227f4dc 100644
--- a/ql/src/test/queries/clientpositive/overridden_confs.q
+++ b/ql/src/test/queries/clientpositive/overridden_confs.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyOverriddenConfigsHook;
 set some.hive.config.doesnt.exit=abc;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parallel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel.q b/ql/src/test/queries/clientpositive/parallel.q
index f2f0d35..ae6ae9c 100644
--- a/ql/src/test/queries/clientpositive/parallel.q
+++ b/ql/src/test/queries/clientpositive/parallel.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set hive.query.name='test_parallel';
 set hive.exec.parallel=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parallel_colstats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_colstats.q b/ql/src/test/queries/clientpositive/parallel_colstats.q
index 86603c1..541b0e6 100644
--- a/ql/src/test/queries/clientpositive/parallel_colstats.q
+++ b/ql/src/test/queries/clientpositive/parallel_colstats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set mapred.job.name='test_parallel';
 set hive.exec.parallel=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parallel_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parallel_join0.q b/ql/src/test/queries/clientpositive/parallel_join0.q
index 69afcb1..544a5a1 100644
--- a/ql/src/test/queries/clientpositive/parallel_join0.q
+++ b/ql/src/test/queries/clientpositive/parallel_join0.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set mapreduce.job.reduces=4;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parenthesis_star_by.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parenthesis_star_by.q b/ql/src/test/queries/clientpositive/parenthesis_star_by.q
index 925bc78..ad94c29 100644
--- a/ql/src/test/queries/clientpositive/parenthesis_star_by.q
+++ b/ql/src/test/queries/clientpositive/parenthesis_star_by.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 SELECT key, value FROM src CLUSTER BY key, value;
 SELECT key, value FROM src ORDER BY key ASC, value ASC;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q b/ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q
index eeae5cf..03ed961 100644
--- a/ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q
+++ b/ql/src/test/queries/clientpositive/parquet_array_map_emptynullvals.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table if exists testSets;
 drop table if exists testSets2;
 create table testSets (

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_join.q b/ql/src/test/queries/clientpositive/parquet_join.q
index 2a2e85b..09b85d5 100644
--- a/ql/src/test/queries/clientpositive/parquet_join.q
+++ b/ql/src/test/queries/clientpositive/parquet_join.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 drop table if exists staging;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd.q b/ql/src/test/queries/clientpositive/parquet_ppd.q
index 56ca96e..5e82f95 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE parquet_tbl(
   key int,
   ldate string)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd_boolean.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_boolean.q b/ql/src/test/queries/clientpositive/parquet_ppd_boolean.q
index 059da68..818f65c 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_boolean.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_boolean.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=5000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd_char.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_char.q b/ql/src/test/queries/clientpositive/parquet_ppd_char.q
index eaddcb4..664bd35 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_char.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_char.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.ppd=true;
 SET mapred.min.split.size=1000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd_date.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_date.q b/ql/src/test/queries/clientpositive/parquet_ppd_date.q
index 41d0d64..c635128 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_date.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_date.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.ppd=true;
 SET mapred.min.split.size=1000;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q b/ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q
index 1b9f6ff..60fbe53 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_timestamp.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.ppd=true;
 SET mapred.min.split.size=1000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_ppd_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_ppd_varchar.q b/ql/src/test/queries/clientpositive/parquet_ppd_varchar.q
index 6449c6d..c30f0b3 100644
--- a/ql/src/test/queries/clientpositive/parquet_ppd_varchar.q
+++ b/ql/src/test/queries/clientpositive/parquet_ppd_varchar.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.ppd=true;
 SET mapred.min.split.size=1000;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q b/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
index f4928c7..b2fa90e 100644
--- a/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
+++ b/ql/src/test/queries/clientpositive/parquet_read_backward_compatible_files.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesparquet
 -- This test makes sure that parquet can read older parquet files written by Hive <= 0.12
 -- alltypesparquet is a files written by older version of Hive