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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/delete_orig_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_orig_table.q 
b/ql/src/test/queries/clientpositive/delete_orig_table.q
index c73b21c..c009b76 100644
--- a/ql/src/test/queries/clientpositive/delete_orig_table.q
+++ b/ql/src/test/queries/clientpositive/delete_orig_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 -- Suppress vectorization due to known bug.  See HIVE-19109.
 set hive.vectorized.execution.enabled=false;
 set hive.test.vectorized.execution.enabled.override=disable;
@@ -7,7 +8,7 @@ set 
hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/delete_orig_table;
-dfs -copyFromLocal ../../data/files/alltypesorc 
${system:test.tmp.dir}/delete_orig_table/00000_0; 
+dfs -copyFromLocal ../../data/files/alltypesorc 
${system:test.tmp.dir}/delete_orig_table/00000_0;
 
 create table acid_dot(
     ctinyint TINYINT,

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

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/delete_whole_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/delete_whole_partition.q 
b/ql/src/test/queries/clientpositive/delete_whole_partition.q
index 4433f61..335404c 100644
--- a/ql/src/test/queries/clientpositive/delete_whole_partition.q
+++ b/ql/src/test/queries/clientpositive/delete_whole_partition.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned.q 
b/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned.q
index 241ff11..05322d5 100644
--- a/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned.q
+++ b/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP VIEW view_partitioned;
 
 CREATE VIEW view_partitioned

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned_json.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned_json.q 
b/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned_json.q
index 150ff70..97fc0cd 100644
--- 
a/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned_json.q
+++ 
b/ql/src/test/queries/clientpositive/describe_formatted_view_partitioned_json.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.ddl.output.format=json;
 
 DROP VIEW view_partitioned;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/describe_syntax.q 
b/ql/src/test/queries/clientpositive/describe_syntax.q
index 9659e9a..3f9db31 100644
--- a/ql/src/test/queries/clientpositive/describe_syntax.q
+++ b/ql/src/test/queries/clientpositive/describe_syntax.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 
 CREATE DATABASE db1;
 CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part 
STRING);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/describe_table.q 
b/ql/src/test/queries/clientpositive/describe_table.q
index c025692..4016236 100644
--- a/ql/src/test/queries/clientpositive/describe_table.q
+++ b/ql/src/test/queries/clientpositive/describe_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 describe srcpart;
 describe srcpart key;
 describe srcpart PARTITION(ds='2008-04-08', hr='12');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_table_json.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/describe_table_json.q 
b/ql/src/test/queries/clientpositive/describe_table_json.q
index f19e98d..8aea7f2 100644
--- a/ql/src/test/queries/clientpositive/describe_table_json.q
+++ b/ql/src/test/queries/clientpositive/describe_table_json.q
@@ -2,11 +2,9 @@ set hive.ddl.output.format=json;
 
 CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json 
table' STORED AS TEXTFILE;
 
-SHOW TABLES;
+SHOW TABLES LIKE 'jsontab*';
 
-SHOW TABLES LIKE 'json*';
-
-SHOW TABLE EXTENDED LIKE 'json*';
+SHOW TABLE EXTENDED LIKE 'jsontab*';
 
 ALTER TABLE jsontable SET TBLPROPERTIES ('id' = 'jsontable');
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/describe_xpath.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/describe_xpath.q 
b/ql/src/test/queries/clientpositive/describe_xpath.q
index b609f85..2280868 100644
--- a/ql/src/test/queries/clientpositive/describe_xpath.q
+++ b/ql/src/test/queries/clientpositive/describe_xpath.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 -- Describe a list structure in a thrift table
 describe src_thrift lint;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q 
b/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
index 991b930..f1839b6 100644
--- a/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
+++ b/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 SET hive.metastore.disallow.incompatible.col.type.changes=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/distinct_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/distinct_stats.q 
b/ql/src/test/queries/clientpositive/distinct_stats.q
index 7251833..0cc795b 100644
--- a/ql/src/test/queries/clientpositive/distinct_stats.q
+++ b/ql/src/test/queries/clientpositive/distinct_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.autogather=true;
 
 set hive.compute.query.using.stats=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dp_counter_mm.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dp_counter_mm.q 
b/ql/src/test/queries/clientpositive/dp_counter_mm.q
index 4f3b100..8f1afc1 100644
--- a/ql/src/test/queries/clientpositive/dp_counter_mm.q
+++ b/ql/src/test/queries/clientpositive/dp_counter_mm.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.max.dynamic.partitions.pernode=200;
 set hive.exec.max.dynamic.partitions=200;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dp_counter_non_mm.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dp_counter_non_mm.q 
b/ql/src/test/queries/clientpositive/dp_counter_non_mm.q
index fc4660e..960f7fc 100644
--- a/ql/src/test/queries/clientpositive/dp_counter_non_mm.q
+++ b/ql/src/test/queries/clientpositive/dp_counter_non_mm.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.dynamic.partition.mode=nonstrict;
 set hive.exec.max.dynamic.partitions.pernode=200;
 set hive.exec.max.dynamic.partitions=200;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/driverhook.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/driverhook.q 
b/ql/src/test/queries/clientpositive/driverhook.q
index 191c154..08db585 100644
--- a/ql/src/test/queries/clientpositive/driverhook.q
+++ b/ql/src/test/queries/clientpositive/driverhook.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.exec.driver.run.hooks=org.apache.hadoop.hive.ql.hooks.DriverTestHook;
 
 -- This query should appear in the Hive CLI output.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/drop_database_removes_partition_dirs.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/drop_database_removes_partition_dirs.q 
b/ql/src/test/queries/clientpositive/drop_database_removes_partition_dirs.q
index a5f5189..e46460f 100644
--- a/ql/src/test/queries/clientpositive/drop_database_removes_partition_dirs.q
+++ b/ql/src/test/queries/clientpositive/drop_database_removes_partition_dirs.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- This test verifies that if a partition exists outside a table's current 
location when the
 -- database is dropped the partition's location is dropped as well.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/drop_table_removes_partition_dirs.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/drop_table_removes_partition_dirs.q 
b/ql/src/test/queries/clientpositive/drop_table_removes_partition_dirs.q
index 102b3ef..1ba3f85 100644
--- a/ql/src/test/queries/clientpositive/drop_table_removes_partition_dirs.q
+++ b/ql/src/test/queries/clientpositive/drop_table_removes_partition_dirs.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- This test verifies that if a partition exists outside the table's current 
location when the
 -- table is dropped the partition's location is dropped as well.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q 
b/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
index 9d20123..8d9f5c1 100644
--- a/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
+++ b/ql/src/test/queries/clientpositive/druidmini_dynamic_partition.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 CREATE TABLE druid_partitioned_table_0
         STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
         TBLPROPERTIES (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/druidmini_test1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/druidmini_test1.q 
b/ql/src/test/queries/clientpositive/druidmini_test1.q
index 630e617..ad9546f 100644
--- a/ql/src/test/queries/clientpositive/druidmini_test1.q
+++ b/ql/src/test/queries/clientpositive/druidmini_test1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 CREATE TABLE druid_table
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR", "druid.query.granularity" 
= "MINUTE")

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/druidmini_test_insert.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/druidmini_test_insert.q 
b/ql/src/test/queries/clientpositive/druidmini_test_insert.q
index 47199b9..f4cb666 100644
--- a/ql/src/test/queries/clientpositive/druidmini_test_insert.q
+++ b/ql/src/test/queries/clientpositive/druidmini_test_insert.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 CREATE TABLE druid_alltypesorc
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
 TBLPROPERTIES ("druid.segment.granularity" = "HOUR", "druid.query.granularity" 
= "MINUTE")

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q 
b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
index 9145a36..7819fdc 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 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/dynamic_partition_pruning_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q 
b/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
index b8b04ee..009cf53 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.explain.user=false;
 set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q 
b/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
index 699e58e..8fa03ac 100644
--- a/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
+++ b/ql/src/test/queries/clientpositive/dynamic_partition_skip_default.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table dynamic_part_table(intcol string) partitioned by (partcol1 
string, partcol2 string);
 
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q 
b/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
index bb041c9..729464e 100644
--- a/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
+++ b/ql/src/test/queries/clientpositive/dynamic_rdd_cache.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 SET hive.map.aggr=true;
 SET hive.multigroupby.singlereducer=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q 
b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q
index 6da0376..705dfdc 100644
--- a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q
+++ b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:alltypesorc
 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/dynamic_semijoin_reduction_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q 
b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q
index 7f83b03..044ce5a 100644
--- a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q
+++ b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 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/dynamic_semijoin_reduction_sw.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q 
b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q
index cece77d..3372cee 100644
--- a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q
+++ b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:alltypesorc
 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/dynamic_semijoin_user_level.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q 
b/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
index 11bd17a..224c511 100644
--- a/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
+++ b/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:alltypesorc
 set hive.explain.user=true;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q 
b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
index 8dac772..9a52fb4 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.optimize.sort.dynamic.partition=true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q 
b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
index c115e62..c852d51 100644
--- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
+++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization_acid2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.exec.dynamic.partition.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/empty_dir_in_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/empty_dir_in_table.q 
b/ql/src/test/queries/clientpositive/empty_dir_in_table.q
index 447ca79..ea609df 100644
--- a/ql/src/test/queries/clientpositive/empty_dir_in_table.q
+++ b/ql/src/test/queries/clientpositive/empty_dir_in_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 dfs ${system:test.dfs.mkdir} hdfs:///target/tmp/test_empty_table;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q 
b/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
index b96a0a0..b095557 100644
--- a/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
+++ b/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS;
 
 -- we're setting this so that TestNegaiveCliDriver.vm doesn't stop processing 
after DROP TABLE fails;
@@ -9,7 +10,7 @@ CREATE TABLE encrypted_table (key INT, value STRING) LOCATION 
'${hiveconf:hive.m
 CRYPTO CREATE_KEY --keyName key_128 --bitLength 128;
 CRYPTO CREATE_ZONE --keyName key_128 --path 
${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table;
 
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 ALTER TABLE encrypted_table SET TBLPROPERTIES("auto.purge"="true");
 
@@ -30,7 +31,7 @@ SELECT COUNT(*) from encrypted_ext_table;
 
 DROP TABLE encrypted_table;
 DROP TABLE encrypted_ext_table;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 -- cleanup
 DROP TABLE IF EXISTS encrypted_table PURGE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_ctas.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_ctas.q 
b/ql/src/test/queries/clientpositive/encryption_ctas.q
index 93058b6..f3314aa 100644
--- a/ql/src/test/queries/clientpositive/encryption_ctas.q
+++ b/ql/src/test/queries/clientpositive/encryption_ctas.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE IF EXISTS testCT.encrypted_tablectas PURGE;
 DROP DATABASE IF EXISTS testCT;
 CREATE DATABASE testCT;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_drop_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_drop_table.q 
b/ql/src/test/queries/clientpositive/encryption_drop_table.q
index 6cffa2b..2212e7d 100644
--- a/ql/src/test/queries/clientpositive/encryption_drop_table.q
+++ b/ql/src/test/queries/clientpositive/encryption_drop_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS;
 
 -- we're setting this so that TestNegaiveCliDriver.vm doesn't stop processing 
after DROP TABLE fails;
@@ -14,13 +15,13 @@ CRYPTO CREATE_ZONE --keyName key_128 --path 
${hiveconf:hive.metastore.warehouse.
 INSERT OVERWRITE TABLE encrypted_table SELECT * FROM src;
 
 CREATE EXTERNAL TABLE encrypted_ext_table (key INT, value STRING) LOCATION 
'${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table';
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 DROP TABLE default.encrypted_ext_table;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 DROP TABLE default.encrypted_table;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 DROP TABLE IF EXISTS encrypted_table1;
 CREATE TABLE encrypted_table1 (key INT, value STRING) LOCATION 
'${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table1';
@@ -33,10 +34,10 @@ SELECT COUNT(*) FROM encrypted_table1;
 
 INSERT OVERWRITE TABLE encrypted_table1 SELECT * FROM src;
 DROP TABLE default.encrypted_table1;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 TRUNCATE TABLE encrypted_table1;
 DROP TABLE default.encrypted_table1;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 
 CRYPTO DELETE_KEY --keyName key_128;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_drop_table_in_encrypted_db.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/encryption_drop_table_in_encrypted_db.q 
b/ql/src/test/queries/clientpositive/encryption_drop_table_in_encrypted_db.q
index f6c48e3..9219c60 100644
--- a/ql/src/test/queries/clientpositive/encryption_drop_table_in_encrypted_db.q
+++ b/ql/src/test/queries/clientpositive/encryption_drop_table_in_encrypted_db.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS;
 
 set hive.cli.errors.ignore=true;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q 
b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
index 089723f..d2f27e3 100644
--- a/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
+++ b/ql/src/test/queries/clientpositive/encryption_join_unencrypted_tbl.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 --SORT_QUERY_RESULTS
 
 DROP TABLE IF EXISTS encrypted_table PURGE;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/encryption_move_tbl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/encryption_move_tbl.q 
b/ql/src/test/queries/clientpositive/encryption_move_tbl.q
index 8d865aa..ff1d57c 100644
--- a/ql/src/test/queries/clientpositive/encryption_move_tbl.q
+++ b/ql/src/test/queries/clientpositive/encryption_move_tbl.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS;
 set hive.stats.column.autogather=false;
 
@@ -19,7 +20,7 @@ CRYPTO CREATE_KEY --keyName key_128_2 --bitLength 128;
 CRYPTO CREATE_ZONE --keyName key_128_2 --path 
${hiveconf:hive.metastore.warehouse.dir}/encrypted_db.db;
 
 INSERT OVERWRITE TABLE encrypted_table SELECT * FROM src;
-SHOW TABLES;
+SHOW TABLES LIKE "encrypted_*";
 ANALYZE TABLE encrypted_table COMPUTE STATISTICS FOR COLUMNS;
 DESCRIBE FORMATTED encrypted_table key;
 DESCRIBE FORMATTED encrypted_table value;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q 
b/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
index 2aa4665..d29f213 100644
--- a/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
+++ b/ql/src/test/queries/clientpositive/enforce_constraint_notnull.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 --  SIMPLE TABLE
 -- create table with first and last column with not null
 CREATE TABLE table1 (a STRING NOT NULL ENFORCED, b STRING, c STRING NOT NULL 
ENFORCED);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/enforce_order.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/enforce_order.q 
b/ql/src/test/queries/clientpositive/enforce_order.q
index da18684..acd0866 100644
--- a/ql/src/test/queries/clientpositive/enforce_order.q
+++ b/ql/src/test/queries/clientpositive/enforce_order.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table table_asc;
 drop table table_desc;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/escape2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape2.q 
b/ql/src/test/queries/clientpositive/escape2.q
index 840b920..6bc1588 100644
--- a/ql/src/test/queries/clientpositive/escape2.q
+++ b/ql/src/test/queries/clientpositive/escape2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/escape_clusterby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_clusterby1.q 
b/ql/src/test/queries/clientpositive/escape_clusterby1.q
index 13ea151..98305b5 100644
--- a/ql/src/test/queries/clientpositive/escape_clusterby1.q
+++ b/ql/src/test/queries/clientpositive/escape_clusterby1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- escaped column names in cluster by are not working jira 3267
 explain
 select key, value from src cluster by key, value;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/escape_distributeby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_distributeby1.q 
b/ql/src/test/queries/clientpositive/escape_distributeby1.q
index 40ed2de..ed28a2d 100644
--- a/ql/src/test/queries/clientpositive/escape_distributeby1.q
+++ b/ql/src/test/queries/clientpositive/escape_distributeby1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- escaped column names in distribute by by are not working jira 3267
 explain
 select key, value from src distribute by key, value;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/escape_orderby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_orderby1.q 
b/ql/src/test/queries/clientpositive/escape_orderby1.q
index 315075a..c98a4ef 100644
--- a/ql/src/test/queries/clientpositive/escape_orderby1.q
+++ b/ql/src/test/queries/clientpositive/escape_orderby1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- escaped column names in order by are not working jira 3267
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/escape_sortby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_sortby1.q 
b/ql/src/test/queries/clientpositive/escape_sortby1.q
index 6b487c8..3dcdad6 100644
--- a/ql/src/test/queries/clientpositive/escape_sortby1.q
+++ b/ql/src/test/queries/clientpositive/escape_sortby1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- escaped column names in sort by are not working jira 3267
 explain
 select key, value from src sort by key, value;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/exchgpartition2lel.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exchgpartition2lel.q 
b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
index b009897..96e99bc 100644
--- a/ql/src/test/queries/clientpositive/exchgpartition2lel.q
+++ b/ql/src/test/queries/clientpositive/exchgpartition2lel.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q 
b/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
index a89b707..75e6e71 100644
--- a/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
+++ b/ql/src/test/queries/clientpositive/exec_parallel_column_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.parallel=true;
 
 create table t as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explain_ddl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_ddl.q 
b/ql/src/test/queries/clientpositive/explain_ddl.q
index e255179..b873088 100644
--- a/ql/src/test/queries/clientpositive/explain_ddl.q
+++ b/ql/src/test/queries/clientpositive/explain_ddl.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- This test is used for testing explain for DDL/DML statements
 
 -- Create some views and tabels

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explain_dependency.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_dependency.q 
b/ql/src/test/queries/clientpositive/explain_dependency.q
index 814ac36..df3cb7a 100644
--- a/ql/src/test/queries/clientpositive/explain_dependency.q
+++ b/ql/src/test/queries/clientpositive/explain_dependency.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- This test is used for testing EXPLAIN DEPENDENCY command
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explain_dependency2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_dependency2.q 
b/ql/src/test/queries/clientpositive/explain_dependency2.q
index 88d4464..b1e6fe7 100644
--- a/ql/src/test/queries/clientpositive/explain_dependency2.q
+++ b/ql/src/test/queries/clientpositive/explain_dependency2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 -- This test is used for testing EXPLAIN DEPENDENCY command
 
 -- select from a table which does not involve a map-reduce job

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explain_logical.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_logical.q 
b/ql/src/test/queries/clientpositive/explain_logical.q
index a468264..261b50a 100644
--- a/ql/src/test/queries/clientpositive/explain_logical.q
+++ b/ql/src/test/queries/clientpositive/explain_logical.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- This test is used for testing EXPLAIN LOGICAL command
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explain_rearrange.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explain_rearrange.q 
b/ql/src/test/queries/clientpositive/explain_rearrange.q
index 0314132..51644c1 100644
--- a/ql/src/test/queries/clientpositive/explain_rearrange.q
+++ b/ql/src/test/queries/clientpositive/explain_rearrange.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.mapred.mode=nonstrict;
 -- query from auto_sortmerge_join_9.q
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainanalyze_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_2.q 
b/ql/src/test/queries/clientpositive/explainanalyze_2.q
index 0b0749e..e708664 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_2.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_2.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.map.aggr=false;
 
 set hive.strict.checks.bucketing=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainanalyze_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_3.q 
b/ql/src/test/queries/clientpositive/explainanalyze_3.q
index 8011124..647f8db 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_3.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.map.aggr=false;
 
 set hive.strict.checks.bucketing=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainanalyze_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_4.q 
b/ql/src/test/queries/clientpositive/explainanalyze_4.q
index 498a128..cf8b864 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_4.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.map.aggr=false;
 
 set hive.mapred.mode=nonstrict;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainanalyze_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_5.q 
b/ql/src/test/queries/clientpositive/explainanalyze_5.q
index 696064c..17f26ca 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_5.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_5.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.map.aggr=false;
 
 set hive.stats.column.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainuser_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_1.q 
b/ql/src/test/queries/clientpositive/explainuser_1.q
index a6fbb54..9675989 100644
--- a/ql/src/test/queries/clientpositive/explainuser_1.q
+++ b/ql/src/test/queries/clientpositive/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/explainuser_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_2.q 
b/ql/src/test/queries/clientpositive/explainuser_2.q
index 560c79e..1b32b47 100644
--- a/ql/src/test/queries/clientpositive/explainuser_2.q
+++ b/ql/src/test/queries/clientpositive/explainuser_2.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false;
 
 set hive.explain.user=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainuser_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_3.q 
b/ql/src/test/queries/clientpositive/explainuser_3.q
index 1e40329..0f63070 100644
--- a/ql/src/test/queries/clientpositive/explainuser_3.q
+++ b/ql/src/test/queries/clientpositive/explainuser_3.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
 set hive.strict.checks.bucketing=false;
 
 set 
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explainuser_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_4.q 
b/ql/src/test/queries/clientpositive/explainuser_4.q
index 8f92140..099971a 100644
--- a/ql/src/test/queries/clientpositive/explainuser_4.q
+++ b/ql/src/test/queries/clientpositive/explainuser_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 set hive.llap.memory.oversubscription.max.executors.per.query=0;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/explode_null.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explode_null.q 
b/ql/src/test/queries/clientpositive/explode_null.q
index 6a540f7..8984fd4 100644
--- a/ql/src/test/queries/clientpositive/explode_null.q
+++ b/ql/src/test/queries/clientpositive/explode_null.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT explode(col) AS myCol FROM 
     (select * from (SELECT array(1,2,3) AS col FROM src LIMIT 1)ea 
      UNION ALL

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/expr_cached.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/expr_cached.q 
b/ql/src/test/queries/clientpositive/expr_cached.q
index 8fc182c..d4521b9 100644
--- a/ql/src/test/queries/clientpositive/expr_cached.q
+++ b/ql/src/test/queries/clientpositive/expr_cached.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- should return a value

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/extract.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/extract.q 
b/ql/src/test/queries/clientpositive/extract.q
index 70c1267..3843b13 100644
--- a/ql/src/test/queries/clientpositive/extract.q
+++ b/ql/src/test/queries/clientpositive/extract.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table extract_udf;
 
 create table extract_udf (t timestamp);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fetch_aggregation.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fetch_aggregation.q 
b/ql/src/test/queries/clientpositive/fetch_aggregation.q
index a56b6c8..391bab9 100644
--- a/ql/src/test/queries/clientpositive/fetch_aggregation.q
+++ b/ql/src/test/queries/clientpositive/fetch_aggregation.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.aggr=true;
 set hive.exec.submitviachild=true;
 set hive.exec.submit.local.task.via.child=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fileformat_mix.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_mix.q 
b/ql/src/test/queries/clientpositive/fileformat_mix.q
index f5bcaec..788c73e 100644
--- a/ql/src/test/queries/clientpositive/fileformat_mix.q
+++ b/ql/src/test/queries/clientpositive/fileformat_mix.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/fileformat_sequencefile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_sequencefile.q 
b/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
index 895c70f..29a69da 100644
--- a/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
+++ b/ql/src/test/queries/clientpositive/fileformat_sequencefile.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 CREATE TABLE dest1(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fileformat_text.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fileformat_text.q 
b/ql/src/test/queries/clientpositive/fileformat_text.q
index 8233ade..4b4e557 100644
--- a/ql/src/test/queries/clientpositive/fileformat_text.q
+++ b/ql/src/test/queries/clientpositive/fileformat_text.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 EXPLAIN
 CREATE TABLE dest1(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_cond_pushdown.q 
b/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
index c325ef8..98ba7c0 100644
--- a/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
+++ b/ql/src/test/queries/clientpositive/filter_cond_pushdown.q
@@ -1,3 +1,7 @@
+--! qt:dataset:src
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
 set hive.mapred.mode=nonstrict;
 EXPLAIN
 SELECT f.key, g.value

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/filter_in_or_dup.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_in_or_dup.q 
b/ql/src/test/queries/clientpositive/filter_in_or_dup.q
index 34a5139..cd76866 100644
--- a/ql/src/test/queries/clientpositive/filter_in_or_dup.q
+++ b/ql/src/test/queries/clientpositive/filter_in_or_dup.q
@@ -1,3 +1,4 @@
+--! qt:dataset:cbo_t1
 set hive.optimize.point.lookup.min=2;
 
 EXPLAIN

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q 
b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
index e88ad41..78a19eb 100644
--- a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q
+++ b/ql/src/test/queries/clientpositive/filter_join_breaktask2.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/filter_numeric.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/filter_numeric.q 
b/ql/src/test/queries/clientpositive/filter_numeric.q
index 9507298..c5fe4e2 100644
--- a/ql/src/test/queries/clientpositive/filter_numeric.q
+++ b/ql/src/test/queries/clientpositive/filter_numeric.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.exec.dynamic.partition.mode=nonstrict;
 
 -- SORT_AND_HASH_QUERY_RESULTS

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/flatten_and_or.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/flatten_and_or.q 
b/ql/src/test/queries/clientpositive/flatten_and_or.q
index 6c6e0f9..40c81bb 100644
--- a/ql/src/test/queries/clientpositive/flatten_and_or.q
+++ b/ql/src/test/queries/clientpositive/flatten_and_or.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.point.lookup=false;
 
 explain

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fm-sketch.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fm-sketch.q 
b/ql/src/test/queries/clientpositive/fm-sketch.q
index 6a65442..3120517 100644
--- a/ql/src/test/queries/clientpositive/fm-sketch.q
+++ b/ql/src/test/queries/clientpositive/fm-sketch.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.stats.ndv.algo=fm;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fold_case.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fold_case.q 
b/ql/src/test/queries/clientpositive/fold_case.q
index 0066c41..e08584b 100644
--- a/ql/src/test/queries/clientpositive/fold_case.q
+++ b/ql/src/test/queries/clientpositive/fold_case.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 select count(1) from src where (case key when '238' then true else false end);
 explain 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q 
b/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
index 9f342c1..a63c1ff 100644
--- a/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
+++ b/ql/src/test/queries/clientpositive/fold_eq_with_case_when.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:lineitem
 set hive.mapred.mode=nonstrict;
 explain
 SELECT  

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fold_when.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fold_when.q 
b/ql/src/test/queries/clientpositive/fold_when.q
index e827a5c..ba62de6 100644
--- a/ql/src/test/queries/clientpositive/fold_when.q
+++ b/ql/src/test/queries/clientpositive/fold_when.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 select key from src where ((case when (key = '238') then null     end) = 1);
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/foldts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/foldts.q 
b/ql/src/test/queries/clientpositive/foldts.q
index 362cac2..8b358a6 100644
--- a/ql/src/test/queries/clientpositive/foldts.q
+++ b/ql/src/test/queries/clientpositive/foldts.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:alltypesorc
 
 set hive.vectorized.execution.enabled=true;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/fouter_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fouter_join_ppr.q 
b/ql/src/test/queries/clientpositive/fouter_join_ppr.q
index e21a3aa..735fba7 100644
--- a/ql/src/test/queries/clientpositive/fouter_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/fouter_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/fp_literal_arithmetic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/fp_literal_arithmetic.q 
b/ql/src/test/queries/clientpositive/fp_literal_arithmetic.q
index b4f36ef..86ac490 100644
--- a/ql/src/test/queries/clientpositive/fp_literal_arithmetic.q
+++ b/ql/src/test/queries/clientpositive/fp_literal_arithmetic.q
@@ -1,3 +1,4 @@
+--! 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/gby_star.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/gby_star.q 
b/ql/src/test/queries/clientpositive/gby_star.q
index 9855460..f1174b9 100644
--- a/ql/src/test/queries/clientpositive/gby_star.q
+++ b/ql/src/test/queries/clientpositive/gby_star.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 explain
 select *, sum(key) from src group by key, value limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1.q 
b/ql/src/test/queries/clientpositive/groupby1.q
index cd3a12b..b337581 100755
--- a/ql/src/test/queries/clientpositive/groupby1.q
+++ b/ql/src/test/queries/clientpositive/groupby1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- due to testMTQueries1
 set hive.stats.column.autogather=false;
 set hive.mapred.mode=nonstrict;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby1_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_limit.q 
b/ql/src/test/queries/clientpositive/groupby1_limit.q
index 6c40e19..379017d 100644
--- a/ql/src/test/queries/clientpositive/groupby1_limit.q
+++ b/ql/src/test/queries/clientpositive/groupby1_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.mapred.mode=nonstrict;
 set mapred.reduce.tasks=31;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby1_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map.q 
b/ql/src/test/queries/clientpositive/groupby1_map.q
index 20eea6e..4f0a031 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map.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/groupby1_map_nomap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q 
b/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
index 059d39c..926aed6 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_nomap.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_nomap.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/groupby1_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_map_skew.q 
b/ql/src/test/queries/clientpositive/groupby1_map_skew.q
index ab42ee2..64cadb3 100644
--- a/ql/src/test/queries/clientpositive/groupby1_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_map_skew.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/groupby1_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby1_noskew.q 
b/ql/src/test/queries/clientpositive/groupby1_noskew.q
index c31528d..6e83829 100644
--- a/ql/src/test/queries/clientpositive/groupby1_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby1_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2.q 
b/ql/src/test/queries/clientpositive/groupby2.q
index 9fa4376..6a8722a 100755
--- a/ql/src/test/queries/clientpositive/groupby2.q
+++ b/ql/src/test/queries/clientpositive/groupby2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby2_limit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_limit.q 
b/ql/src/test/queries/clientpositive/groupby2_limit.q
index 2608725..095737d 100644
--- a/ql/src/test/queries/clientpositive/groupby2_limit.q
+++ b/ql/src/test/queries/clientpositive/groupby2_limit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set mapred.reduce.tasks=31;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby2_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map.q 
b/ql/src/test/queries/clientpositive/groupby2_map.q
index e3f9e31..457e401 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map.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/groupby2_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q 
b/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
index d36301a..f4f241c 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_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/groupby2_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_map_skew.q 
b/ql/src/test/queries/clientpositive/groupby2_map_skew.q
index 73a7594..4fef7d1 100644
--- a/ql/src/test/queries/clientpositive/groupby2_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_map_skew.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/groupby2_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby2_noskew.q 
b/ql/src/test/queries/clientpositive/groupby2_noskew.q
index 182666a..f467fba 100644
--- a/ql/src/test/queries/clientpositive/groupby2_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby2_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3.q 
b/ql/src/test/queries/clientpositive/groupby3.q
index 284c2a8..0d6f00f 100755
--- a/ql/src/test/queries/clientpositive/groupby3.q
+++ b/ql/src/test/queries/clientpositive/groupby3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=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/groupby3_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map.q 
b/ql/src/test/queries/clientpositive/groupby3_map.q
index 7aea2d4..ebfb696 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map.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/groupby3_map_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q 
b/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
index 60d7b7f..a72b6fb 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_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/groupby3_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby3_map_skew.q 
b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
index 8b18d11..01b616c 100644
--- a/ql/src/test/queries/clientpositive/groupby3_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby3_map_skew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=false;
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=true;
@@ -33,4 +34,3 @@ INSERT OVERWRITE TABLE dest1 SELECT
 
 SELECT ROUND(c1, 1), ROUND(c2, 3), ROUND(c3, 5), ROUND(c4, 1), ROUND(c5, 1), 
ROUND(c6, 5),
 ROUND(c7,5), ROUND(c8, 5), ROUND(c9, 5) FROM dest1;
-

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q 
b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
index 55d9a58..2c8cf5d 100644
--- a/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/groupby3_noskew_multi_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby4_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map.q 
b/ql/src/test/queries/clientpositive/groupby4_map.q
index f7fba87..09f223a 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map.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/groupby4_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_map_skew.q 
b/ql/src/test/queries/clientpositive/groupby4_map_skew.q
index 867e2e2..a8c8a8c 100644
--- a/ql/src/test/queries/clientpositive/groupby4_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_map_skew.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/groupby4_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby4_noskew.q 
b/ql/src/test/queries/clientpositive/groupby4_noskew.q
index b5fead5..69e1597 100644
--- a/ql/src/test/queries/clientpositive/groupby4_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby4_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby5_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby5_map.q 
b/ql/src/test/queries/clientpositive/groupby5_map.q
index 4fd6445..0704b69 100644
--- a/ql/src/test/queries/clientpositive/groupby5_map.q
+++ b/ql/src/test/queries/clientpositive/groupby5_map.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby6_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map.q 
b/ql/src/test/queries/clientpositive/groupby6_map.q
index 4a1542b..9d184e0 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map.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/groupby6_map_skew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_map_skew.q 
b/ql/src/test/queries/clientpositive/groupby6_map_skew.q
index 0ee2bdb..d47750c 100644
--- a/ql/src/test/queries/clientpositive/groupby6_map_skew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_map_skew.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/groupby6_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby6_noskew.q 
b/ql/src/test/queries/clientpositive/groupby6_noskew.q
index bf53f10..a40af5f 100644
--- a/ql/src/test/queries/clientpositive/groupby6_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby6_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr=false;
 

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

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby7_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby7_noskew.q 
b/ql/src/test/queries/clientpositive/groupby7_noskew.q
index 03214f8..fcdaeb4 100644
--- a/ql/src/test/queries/clientpositive/groupby7_noskew.q
+++ b/ql/src/test/queries/clientpositive/groupby7_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 set hive.multigroupby.singlereducer=false;
 set hive.groupby.skewindata=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
----------------------------------------------------------------------
diff --git 
a/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q 
b/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
index aa5773a..f8ee474 100644
--- a/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
+++ b/ql/src/test/queries/clientpositive/groupby7_noskew_multi_single_reducer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=false;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby8_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby8_map.q 
b/ql/src/test/queries/clientpositive/groupby8_map.q
index ad537e1..96286d3 100644
--- a/ql/src/test/queries/clientpositive/groupby8_map.q
+++ b/ql/src/test/queries/clientpositive/groupby8_map.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr=true;
 set hive.groupby.skewindata=false;
 set mapred.reduce.tasks=31;

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_bigdata.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_bigdata.q 
b/ql/src/test/queries/clientpositive/groupby_bigdata.q
index 2e3eddc..af7cdb2 100644
--- a/ql/src/test/queries/clientpositive/groupby_bigdata.q
+++ b/ql/src/test/queries/clientpositive/groupby_bigdata.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.map.aggr.hash.percentmemory = 0.3;
 set hive.mapred.local.mem = 384;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/groupby_complex_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/groupby_complex_types.q 
b/ql/src/test/queries/clientpositive/groupby_complex_types.q
index 511456d..7ea9f59 100644
--- a/ql/src/test/queries/clientpositive/groupby_complex_types.q
+++ b/ql/src/test/queries/clientpositive/groupby_complex_types.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE DEST1(key ARRAY<STRING>, value BIGINT) STORED AS TEXTFILE;

Reply via email to