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

[14/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/ansi_sql_arithmetic.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q b/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
index b343d78..dc235df 100644
--- a/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
+++ b/ql/src/test/queries/clientpositive/ansi_sql_arithmetic.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 set hive.compat=latest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
index e961641..75bd579 100644
--- a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
+++ b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.archive.enabled = true;
 set hive.exec.submitviachild=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/archive_multi.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/archive_multi.q b/ql/src/test/queries/clientpositive/archive_multi.q
index c18f991..60cb4a9 100644
--- a/ql/src/test/queries/clientpositive/archive_multi.q
+++ b/ql/src/test/queries/clientpositive/archive_multi.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.archive.enabled = true;
 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/array_map_access_nonconstant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/array_map_access_nonconstant.q b/ql/src/test/queries/clientpositive/array_map_access_nonconstant.q
index ea6e9d5..154641e 100644
--- a/ql/src/test/queries/clientpositive/array_map_access_nonconstant.q
+++ b/ql/src/test/queries/clientpositive/array_map_access_nonconstant.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 create table array_table (`array` array<string>, index int );

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_1.q b/ql/src/test/queries/clientpositive/authorization_1.q
index 184acc7..42abff0 100644
--- a/ql/src/test/queries/clientpositive/authorization_1.q
+++ b/ql/src/test/queries/clientpositive/authorization_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_2.q b/ql/src/test/queries/clientpositive/authorization_2.q
index efb42f7..942b09f 100644
--- a/ql/src/test/queries/clientpositive/authorization_2.q
+++ b/ql/src/test/queries/clientpositive/authorization_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_3.q b/ql/src/test/queries/clientpositive/authorization_3.q
index 09c6494..95c25fe 100644
--- a/ql/src/test/queries/clientpositive/authorization_3.q
+++ b/ql/src/test/queries/clientpositive/authorization_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_4.q b/ql/src/test/queries/clientpositive/authorization_4.q
index c1848a7..f76ba1f 100644
--- a/ql/src/test/queries/clientpositive/authorization_4.q
+++ b/ql/src/test/queries/clientpositive/authorization_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_6.q b/ql/src/test/queries/clientpositive/authorization_6.q
index 5f9bde7..f105d05 100644
--- a/ql/src/test/queries/clientpositive/authorization_6.q
+++ b/ql/src/test/queries/clientpositive/authorization_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_9.q b/ql/src/test/queries/clientpositive/authorization_9.q
index 5f72665..19892dd 100644
--- a/ql/src/test/queries/clientpositive/authorization_9.q
+++ b/ql/src/test/queries/clientpositive/authorization_9.q
@@ -1,19 +1,22 @@
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 -- SORT_BEFORE_DIFF
 
+create database authorization_9;
+use authorization_9;
+
 create table dummy (key string, value string);
 
 grant select to user hive_test_user;
-grant select on database default to user hive_test_user;
+grant select on database authorization_9 to user hive_test_user;
 grant select on table dummy to user hive_test_user;
 grant select (key, value) on table dummy to user hive_test_user;
 
-show grant user hive_test_user on database default;
+show grant user hive_test_user on database authorization_9;
 show grant user hive_test_user on table dummy;
 show grant user hive_test_user on all;
 
 grant select to user hive_test_user2;
-grant select on database default to user hive_test_user2;
+grant select on database authorization_9 to user hive_test_user2;
 grant select on table dummy to user hive_test_user2;
 grant select (key, value) on table dummy to user hive_test_user2;
 
@@ -22,11 +25,11 @@ show grant user hive_test_user on all;
 show grant user hive_test_user2 on all;
 
 revoke select from user hive_test_user;
-revoke select on database default from user hive_test_user;
+revoke select on database authorization_9 from user hive_test_user;
 revoke select on table dummy from user hive_test_user;
 revoke select (key, value) on table dummy from user hive_test_user;
 
 revoke select from user hive_test_user2;
-revoke select on database default from user hive_test_user2;
+revoke select on database authorization_9 from user hive_test_user2;
 revoke select on table dummy from user hive_test_user2;
 revoke select (key, value) on table dummy from user hive_test_user2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q b/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
index c666e97..257c3cc 100644
--- a/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
+++ b/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.test.authz.sstd.hs2.mode=true;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
 set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_alter_table_exchange_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_alter_table_exchange_partition.q b/ql/src/test/queries/clientpositive/authorization_alter_table_exchange_partition.q
index 1ff4560..4ffe4a1 100644
--- a/ql/src/test/queries/clientpositive/authorization_alter_table_exchange_partition.q
+++ b/ql/src/test/queries/clientpositive/authorization_alter_table_exchange_partition.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.test.authz.sstd.hs2.mode=true;
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
 set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_cli_nonsql.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_cli_nonsql.q b/ql/src/test/queries/clientpositive/authorization_cli_nonsql.q
index 58d3bf5..5bc4814 100644
--- a/ql/src/test/queries/clientpositive/authorization_cli_nonsql.q
+++ b/ql/src/test/queries/clientpositive/authorization_cli_nonsql.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
 set hive.security.authorization.enabled=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_create_temp_table.q b/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
index bdeea81..4878e20 100644
--- a/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
+++ b/ql/src/test/queries/clientpositive/authorization_create_temp_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.test.authz.sstd.hs2.mode=true;
 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/authorization_explain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_explain.q b/ql/src/test/queries/clientpositive/authorization_explain.q
index d429704..7866581 100644
--- a/ql/src/test/queries/clientpositive/authorization_explain.q
+++ b/ql/src/test/queries/clientpositive/authorization_explain.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 set hive.mapred.mode=nonstrict;
 set hive.security.authorization.enabled=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_1.q b/ql/src/test/queries/clientpositive/authorization_view_1.q
index 86accdc..a355d33 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_1.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 create table src_autho_test as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_2.q b/ql/src/test/queries/clientpositive/authorization_view_2.q
index 8e6138d..048cf6c 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_2.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 create table src_autho_test as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_3.q b/ql/src/test/queries/clientpositive/authorization_view_3.q
index aaf971e..31592b0 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_3.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 create table src_autho_test as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_4.q b/ql/src/test/queries/clientpositive/authorization_view_4.q
index 53ce350..d87070d 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_4.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 create table src_autho_test as select * from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_8.q b/ql/src/test/queries/clientpositive/authorization_view_8.q
index 82fc97b..7b252b4 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_8.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 
 create table my_passwd (
@@ -12,7 +13,6 @@ insert into my_passwd values
                       ("Gopal", 5),
                       ("Sergey", 6);
 
-
 set hive.cbo.enable=false;
 create view my_passwd_vw as select * from my_passwd limit 3;
 
@@ -20,4 +20,4 @@ set hive.security.authorization.enabled=true;
 grant select on table my_passwd to user hive_test_user;
 grant select on table my_passwd_vw to user hive_test_user;
 
-select * from my_passwd_vw;
\ No newline at end of file
+select * from my_passwd_vw;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_1.q b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_1.q
index 42652ea..07cd949 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_1.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
 set hive.cbo.enable=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_2.q b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_2.q
index 03d4387..0b6edf1 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_2.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=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/authorization_view_disable_cbo_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_3.q b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_3.q
index 44f9503..34cd490 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_3.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=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/authorization_view_disable_cbo_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_4.q b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_4.q
index 40424c4..9953349 100644
--- a/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_4.q
+++ b/ql/src/test/queries/clientpositive/authorization_view_disable_cbo_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.cbo.enable=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/autoColumnStats_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_1.q b/ql/src/test/queries/clientpositive/autoColumnStats_1.q
index c6ebc33..d584e0d 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_1.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_1.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false;
 
 set hive.stats.column.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_2.q b/ql/src/test/queries/clientpositive/autoColumnStats_2.q
index fadac76..57266af 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_2.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_2.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.strict.checks.bucketing=false;
 
 set hive.stats.column.autogather=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_3.q b/ql/src/test/queries/clientpositive/autoColumnStats_3.q
index 2ddd981..63f3a94 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_3.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.stats.fetch.column.stats=true;
 set hive.exec.dynamic.partition=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_4.q b/ql/src/test/queries/clientpositive/autoColumnStats_4.q
index 9780a75..8bd0b2c 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_4.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.stats.column.autogather=true;
 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/autoColumnStats_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_5.q b/ql/src/test/queries/clientpositive/autoColumnStats_5.q
index d59099c..3da7b38 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_5.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.stats.column.autogather=true;
 set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_5a.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_5a.q b/ql/src/test/queries/clientpositive/autoColumnStats_5a.q
index a8bce18..0d94344 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_5a.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_5a.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.stats.column.autogather=true;
 set hive.mapred.mode=nonstrict;
 set hive.cli.print.header=true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_6.q b/ql/src/test/queries/clientpositive/autoColumnStats_6.q
index 45e5daa..315286b 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_6.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=true;
 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/autoColumnStats_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_7.q b/ql/src/test/queries/clientpositive/autoColumnStats_7.q
index 2227685..8622b23 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_7.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=true;
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 set hive.map.aggr=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_8.q b/ql/src/test/queries/clientpositive/autoColumnStats_8.q
index 42d070a..490aadc 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_8.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.stats.column.autogather=true;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/autoColumnStats_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autoColumnStats_9.q b/ql/src/test/queries/clientpositive/autoColumnStats_9.q
index 85f85bc..944da2c 100644
--- a/ql/src/test/queries/clientpositive/autoColumnStats_9.q
+++ b/ql/src/test/queries/clientpositive/autoColumnStats_9.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.stats.column.autogather=true;
 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/auto_join0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join0.q b/ql/src/test/queries/clientpositive/auto_join0.q
index 1e1e7d1..f15f427 100644
--- a/ql/src/test/queries/clientpositive/auto_join0.q
+++ b/ql/src/test/queries/clientpositive/auto_join0.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.auto.convert.join = true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join10.q b/ql/src/test/queries/clientpositive/auto_join10.q
index dad21c5..80ba6ff 100644
--- a/ql/src/test/queries/clientpositive/auto_join10.q
+++ b/ql/src/test/queries/clientpositive/auto_join10.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/auto_join11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join11.q b/ql/src/test/queries/clientpositive/auto_join11.q
index c56df2d..3a577a8 100644
--- a/ql/src/test/queries/clientpositive/auto_join11.q
+++ b/ql/src/test/queries/clientpositive/auto_join11.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join12.q b/ql/src/test/queries/clientpositive/auto_join12.q
index 55cd6e9..0f40202 100644
--- a/ql/src/test/queries/clientpositive/auto_join12.q
+++ b/ql/src/test/queries/clientpositive/auto_join12.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join13.q b/ql/src/test/queries/clientpositive/auto_join13.q
index ecf4c3b..8d97258 100644
--- a/ql/src/test/queries/clientpositive/auto_join13.q
+++ b/ql/src/test/queries/clientpositive/auto_join13.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join14.q b/ql/src/test/queries/clientpositive/auto_join14.q
index 6ad1fed..2ce606a 100644
--- a/ql/src/test/queries/clientpositive/auto_join14.q
+++ b/ql/src/test/queries/clientpositive/auto_join14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! 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/auto_join14_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join14_hadoop20.q b/ql/src/test/queries/clientpositive/auto_join14_hadoop20.q
index 99815f5..6825da2 100644
--- a/ql/src/test/queries/clientpositive/auto_join14_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/auto_join14_hadoop20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join15.q b/ql/src/test/queries/clientpositive/auto_join15.q
index 66b745f..2a0e417 100644
--- a/ql/src/test/queries/clientpositive/auto_join15.q
+++ b/ql/src/test/queries/clientpositive/auto_join15.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join16.q b/ql/src/test/queries/clientpositive/auto_join16.q
index 3440817..dac60cf 100644
--- a/ql/src/test/queries/clientpositive/auto_join16.q
+++ b/ql/src/test/queries/clientpositive/auto_join16.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/auto_join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join17.q b/ql/src/test/queries/clientpositive/auto_join17.q
index 43c5860..6b63513 100644
--- a/ql/src/test/queries/clientpositive/auto_join17.q
+++ b/ql/src/test/queries/clientpositive/auto_join17.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join18.q b/ql/src/test/queries/clientpositive/auto_join18.q
index 1340bf0..a527b18 100644
--- a/ql/src/test/queries/clientpositive/auto_join18.q
+++ b/ql/src/test/queries/clientpositive/auto_join18.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join18_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q b/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
index 67400bd..c6a47ca 100644
--- a/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/auto_join18_multi_distinct.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join19.q b/ql/src/test/queries/clientpositive/auto_join19.q
index 532a21e..f231e07 100644
--- a/ql/src/test/queries/clientpositive/auto_join19.q
+++ b/ql/src/test/queries/clientpositive/auto_join19.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! 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/auto_join19_inclause.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join19_inclause.q b/ql/src/test/queries/clientpositive/auto_join19_inclause.q
index 7773289..f8d16b5 100644
--- a/ql/src/test/queries/clientpositive/auto_join19_inclause.q
+++ b/ql/src/test/queries/clientpositive/auto_join19_inclause.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.auto.convert.join = true;
 set hive.optimize.point.lookup.min=2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join2.q b/ql/src/test/queries/clientpositive/auto_join2.q
index 239162e..47324de 100644
--- a/ql/src/test/queries/clientpositive/auto_join2.q
+++ b/ql/src/test/queries/clientpositive/auto_join2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join20.q b/ql/src/test/queries/clientpositive/auto_join20.q
index e619584..d97fb00 100644
--- a/ql/src/test/queries/clientpositive/auto_join20.q
+++ b/ql/src/test/queries/clientpositive/auto_join20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.auto.convert.join = true;
 
 explain

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join23.q b/ql/src/test/queries/clientpositive/auto_join23.q
index 4314f73..91cf3cd 100644
--- a/ql/src/test/queries/clientpositive/auto_join23.q
+++ b/ql/src/test/queries/clientpositive/auto_join23.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join24.q b/ql/src/test/queries/clientpositive/auto_join24.q
index c800164..32d5cf4 100644
--- a/ql/src/test/queries/clientpositive/auto_join24.q
+++ b/ql/src/test/queries/clientpositive/auto_join24.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/auto_join25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join25.q b/ql/src/test/queries/clientpositive/auto_join25.q
index 08dd491..8f30095 100644
--- a/ql/src/test/queries/clientpositive/auto_join25.q
+++ b/ql/src/test/queries/clientpositive/auto_join25.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! 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;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join26.q b/ql/src/test/queries/clientpositive/auto_join26.q
index 44a4a30..9203b26 100644
--- a/ql/src/test/queries/clientpositive/auto_join26.q
+++ b/ql/src/test/queries/clientpositive/auto_join26.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/auto_join27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join27.q b/ql/src/test/queries/clientpositive/auto_join27.q
index f3c5004..9669450 100644
--- a/ql/src/test/queries/clientpositive/auto_join27.q
+++ b/ql/src/test/queries/clientpositive/auto_join27.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/auto_join28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join28.q b/ql/src/test/queries/clientpositive/auto_join28.q
index 61b9d84..57f89bd 100644
--- a/ql/src/test/queries/clientpositive/auto_join28.q
+++ b/ql/src/test/queries/clientpositive/auto_join28.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapjoin.smalltable.filesize = 1;
 
 set hive.auto.convert.join = true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join3.q b/ql/src/test/queries/clientpositive/auto_join3.q
index 8f10786..bd29c9a 100644
--- a/ql/src/test/queries/clientpositive/auto_join3.q
+++ b/ql/src/test/queries/clientpositive/auto_join3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join30.q b/ql/src/test/queries/clientpositive/auto_join30.q
index 7ac3c0e..7150d51 100644
--- a/ql/src/test/queries/clientpositive/auto_join30.q
+++ b/ql/src/test/queries/clientpositive/auto_join30.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 set hive.auto.convert.join = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join31.q b/ql/src/test/queries/clientpositive/auto_join31.q
index cfa5eba..3435c13 100644
--- a/ql/src/test/queries/clientpositive/auto_join31.q
+++ b/ql/src/test/queries/clientpositive/auto_join31.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.auto.convert.join = true;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join33.q b/ql/src/test/queries/clientpositive/auto_join33.q
index 654a826..2843ff4 100644
--- a/ql/src/test/queries/clientpositive/auto_join33.q
+++ b/ql/src/test/queries/clientpositive/auto_join33.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/auto_join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join4.q b/ql/src/test/queries/clientpositive/auto_join4.q
index 5a582d3..0a8848b 100644
--- a/ql/src/test/queries/clientpositive/auto_join4.q
+++ b/ql/src/test/queries/clientpositive/auto_join4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join5.q b/ql/src/test/queries/clientpositive/auto_join5.q
index 0dd844c..5967319 100644
--- a/ql/src/test/queries/clientpositive/auto_join5.q
+++ b/ql/src/test/queries/clientpositive/auto_join5.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join6.q b/ql/src/test/queries/clientpositive/auto_join6.q
index b00c7f4..b356f55 100644
--- a/ql/src/test/queries/clientpositive/auto_join6.q
+++ b/ql/src/test/queries/clientpositive/auto_join6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join7.q b/ql/src/test/queries/clientpositive/auto_join7.q
index 091a37e..bd13519 100644
--- a/ql/src/test/queries/clientpositive/auto_join7.q
+++ b/ql/src/test/queries/clientpositive/auto_join7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join8.q b/ql/src/test/queries/clientpositive/auto_join8.q
index 32d6b2d..d9d3f91 100644
--- a/ql/src/test/queries/clientpositive/auto_join8.q
+++ b/ql/src/test/queries/clientpositive/auto_join8.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join9.q b/ql/src/test/queries/clientpositive/auto_join9.q
index 3b74153..72676d4 100644
--- a/ql/src/test/queries/clientpositive/auto_join9.q
+++ b/ql/src/test/queries/clientpositive/auto_join9.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! 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/auto_join_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_stats.q b/ql/src/test/queries/clientpositive/auto_join_stats.q
index de56abd..7720fdc 100644
--- a/ql/src/test/queries/clientpositive/auto_join_stats.q
+++ b/ql/src/test/queries/clientpositive/auto_join_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.auto.convert.join = true;
 set hive.auto.convert.join.noconditionaltask.size=2660;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_join_stats2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_stats2.q b/ql/src/test/queries/clientpositive/auto_join_stats2.q
index 6f9140a..dc4a996 100644
--- a/ql/src/test/queries/clientpositive/auto_join_stats2.q
+++ b/ql/src/test/queries/clientpositive/auto_join_stats2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! 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/auto_join_without_localtask.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
index 6438908..ba3eeae 100644
--- a/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
+++ b/ql/src/test/queries/clientpositive/auto_join_without_localtask.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecutePrinter,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
 set hive.auto.convert.join=true;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
index 845d369..6949f8c 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q
index abd3a34..1cbda1f 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
index d9066a4..f95d36c 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
index 0864188..86ba6cf 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q
index 32b57ab..44d3452 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 
 set hive.exec.reducers.max = 1;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
index e5fdcb5..0413b51 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
index 673a460..7062b82 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
index abf09e5..1a23fca 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
index b163498..50303cf 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
index 25eeee3..32745c9 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.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/auto_sortmerge_join_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
index bd78086..96f4250 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
index d09f83b..6783d35 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/auto_sortmerge_join_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q
index 1abdc2c..b342dea 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:part
 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/autogen_colalias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/autogen_colalias.q b/ql/src/test/queries/clientpositive/autogen_colalias.q
index 5bbd433..2030c2a 100644
--- a/ql/src/test/queries/clientpositive/autogen_colalias.q
+++ b/ql/src/test/queries/clientpositive/autogen_colalias.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TEMPORARY FUNCTION test_max AS 'org.apache.hadoop.hive.ql.udf.UDAFTestMax';
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/avro_add_column3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_add_column3.q b/ql/src/test/queries/clientpositive/avro_add_column3.q
index 2d9cb6f..939cb4f 100644
--- a/ql/src/test/queries/clientpositive/avro_add_column3.q
+++ b/ql/src/test/queries/clientpositive/avro_add_column3.q
@@ -1,3 +1,4 @@
+--! 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/avro_compression_enabled.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_compression_enabled.q b/ql/src/test/queries/clientpositive/avro_compression_enabled.q
index 58867ff..e0fa2b6 100644
--- a/ql/src/test/queries/clientpositive/avro_compression_enabled.q
+++ b/ql/src/test/queries/clientpositive/avro_compression_enabled.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- verify that new joins bring in correct schemas (including evolved schemas)
 
 CREATE TABLE doctors4

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/avro_compression_enabled_native.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avro_compression_enabled_native.q b/ql/src/test/queries/clientpositive/avro_compression_enabled_native.q
index 99c38ba..b168880f 100644
--- a/ql/src/test/queries/clientpositive/avro_compression_enabled_native.q
+++ b/ql/src/test/queries/clientpositive/avro_compression_enabled_native.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- verify that new joins bring in correct schemas (including evolved schemas)
 
 CREATE TABLE doctors4 (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/avrocountemptytbl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/avrocountemptytbl.q b/ql/src/test/queries/clientpositive/avrocountemptytbl.q
index 3ede2bb..98c3a45 100644
--- a/ql/src/test/queries/clientpositive/avrocountemptytbl.q
+++ b/ql/src/test/queries/clientpositive/avrocountemptytbl.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 drop table if exists emptyavro;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ba_table1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ba_table1.q b/ql/src/test/queries/clientpositive/ba_table1.q
index fe687e6..cce7ccb 100644
--- a/ql/src/test/queries/clientpositive/ba_table1.q
+++ b/ql/src/test/queries/clientpositive/ba_table1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 drop table ba_test;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ba_table2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ba_table2.q b/ql/src/test/queries/clientpositive/ba_table2.q
index 1746091..71689f0 100644
--- a/ql/src/test/queries/clientpositive/ba_table2.q
+++ b/ql/src/test/queries/clientpositive/ba_table2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 drop table ba_test;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ba_table3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ba_table3.q b/ql/src/test/queries/clientpositive/ba_table3.q
index 8137722..0423327 100644
--- a/ql/src/test/queries/clientpositive/ba_table3.q
+++ b/ql/src/test/queries/clientpositive/ba_table3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ba_test;
 
 -- All the tests of ba_table1.q + test for a group-by and aggregation on a binary key.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ba_table_udfs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ba_table_udfs.q b/ql/src/test/queries/clientpositive/ba_table_udfs.q
index 7d952db..676e06a 100644
--- a/ql/src/test/queries/clientpositive/ba_table_udfs.q
+++ b/ql/src/test/queries/clientpositive/ba_table_udfs.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 USE default;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ba_table_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ba_table_union.q b/ql/src/test/queries/clientpositive/ba_table_union.q
index bf35d0e..3371f08 100644
--- a/ql/src/test/queries/clientpositive/ba_table_union.q
+++ b/ql/src/test/queries/clientpositive/ba_table_union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ba_test;
 
 -- this query tests ba_table1.q + nested queries with multiple operations on binary data types + union on binary types 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/binary_constant.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/binary_constant.q b/ql/src/test/queries/clientpositive/binary_constant.q
index 4f80dc3..2c02ced 100644
--- a/ql/src/test/queries/clientpositive/binary_constant.q
+++ b/ql/src/test/queries/clientpositive/binary_constant.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 select cast(cast('a' as binary) as string) from src tablesample (1 rows);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/binary_output_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/binary_output_format.q b/ql/src/test/queries/clientpositive/binary_output_format.q
index c5d9abd..9ead0cc 100644
--- a/ql/src/test/queries/clientpositive/binary_output_format.q
+++ b/ql/src/test/queries/clientpositive/binary_output_format.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Create a table with binary output format
 CREATE TABLE dest1(mydata STRING)
 ROW FORMAT SERDE

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/binary_table_bincolserde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/binary_table_bincolserde.q b/ql/src/test/queries/clientpositive/binary_table_bincolserde.q
index 47a560c..7b99e40 100644
--- a/ql/src/test/queries/clientpositive/binary_table_bincolserde.q
+++ b/ql/src/test/queries/clientpositive/binary_table_bincolserde.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ba_test;
 
 -- Tests everything in binary_table_colserde.q + uses LazyBinaryColumnarSerde

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/binary_table_colserde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/binary_table_colserde.q b/ql/src/test/queries/clientpositive/binary_table_colserde.q
index 1f5c98a..71a4b22 100644
--- a/ql/src/test/queries/clientpositive/binary_table_colserde.q
+++ b/ql/src/test/queries/clientpositive/binary_table_colserde.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table ba_test;
 
 -- Everything in ba_table1.q + columnar serde in RCFILE.

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bitvector.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bitvector.q b/ql/src/test/queries/clientpositive/bitvector.q
index d8669f2..975db29 100644
--- a/ql/src/test/queries/clientpositive/bitvector.q
+++ b/ql/src/test/queries/clientpositive/bitvector.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 desc formatted src key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket1.q b/ql/src/test/queries/clientpositive/bucket1.q
index 6a59465..beb4a81 100644
--- a/ql/src/test/queries/clientpositive/bucket1.q
+++ b/ql/src/test/queries/clientpositive/bucket1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 ;
 set hive.exec.reducers.max = 200;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket2.q b/ql/src/test/queries/clientpositive/bucket2.q
index 4e63859..c7ecb6e 100644
--- a/ql/src/test/queries/clientpositive/bucket2.q
+++ b/ql/src/test/queries/clientpositive/bucket2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 ;
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket3.q b/ql/src/test/queries/clientpositive/bucket3.q
index b11e4da..fd8b2e3 100644
--- a/ql/src/test/queries/clientpositive/bucket3.q
+++ b/ql/src/test/queries/clientpositive/bucket3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 ;
 set hive.exec.reducers.max = 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket4.q b/ql/src/test/queries/clientpositive/bucket4.q
index 7cd962d..e3fe660 100644
--- a/ql/src/test/queries/clientpositive/bucket4.q
+++ b/ql/src/test/queries/clientpositive/bucket4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 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/bucket5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket5.q b/ql/src/test/queries/clientpositive/bucket5.q
index bf4fbb0..7c3da98 100644
--- a/ql/src/test/queries/clientpositive/bucket5.q
+++ b/ql/src/test/queries/clientpositive/bucket5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 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/bucket6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket6.q b/ql/src/test/queries/clientpositive/bucket6.q
index 0484d33..ef4a16e 100644
--- a/ql/src/test/queries/clientpositive/bucket6.q
+++ b/ql/src/test/queries/clientpositive/bucket6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 CREATE TABLE src_bucket(key STRING, value STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_groupby.q b/ql/src/test/queries/clientpositive/bucket_groupby.q
index 3cb6709..4708d33 100644
--- a/ql/src/test/queries/clientpositive/bucket_groupby.q
+++ b/ql/src/test/queries/clientpositive/bucket_groupby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 create table clustergroupby(key string, value string) partitioned by(ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket_many.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_many.q b/ql/src/test/queries/clientpositive/bucket_many.q
index 8a64ff1..6cd3004 100644
--- a/ql/src/test/queries/clientpositive/bucket_many.q
+++ b/ql/src/test/queries/clientpositive/bucket_many.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 ;
 set mapred.reduce.tasks = 16;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
index 3fa7a04..3ae141b 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_spark4.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_spark4.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/bucket_map_join_tez2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q b/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
index 70ea213..1361e32 100644
--- a/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
+++ b/ql/src/test/queries/clientpositive/bucket_map_join_tez2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.strict.checks.bucketing=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket_num_reducers.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_num_reducers.q b/ql/src/test/queries/clientpositive/bucket_num_reducers.q
index 5c5008e..7483e5e 100644
--- a/ql/src/test/queries/clientpositive/bucket_num_reducers.q
+++ b/ql/src/test/queries/clientpositive/bucket_num_reducers.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.stats.column.autogather=false;
 set hive.exec.mode.local.auto=false;
 set mapred.reduce.tasks = 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucket_num_reducers2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucket_num_reducers2.q b/ql/src/test/queries/clientpositive/bucket_num_reducers2.q
index 2533ae8..2c4e697 100644
--- a/ql/src/test/queries/clientpositive/bucket_num_reducers2.q
+++ b/ql/src/test/queries/clientpositive/bucket_num_reducers2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.mode.local.auto=false;
 set hive.exec.reducers.max = 2;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucketcontext_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_1.q b/ql/src/test/queries/clientpositive/bucketcontext_1.q
index 876bc0f..cf5fa6c 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_1.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_2.q b/ql/src/test/queries/clientpositive/bucketcontext_2.q
index 53518c4..a53105c 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_2.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_3.q b/ql/src/test/queries/clientpositive/bucketcontext_3.q
index 5eadd1d..b77173a 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_3.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_4.q b/ql/src/test/queries/clientpositive/bucketcontext_4.q
index f5e0150..b311372 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_4.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_5.q b/ql/src/test/queries/clientpositive/bucketcontext_5.q
index 85acdd9..332d533 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_5.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=false;
 
 -- small no part, 4 bucket & big no part, 2 bucket

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucketcontext_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_6.q b/ql/src/test/queries/clientpositive/bucketcontext_6.q
index d7ab5e3..0b608ec 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_6.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_7.q b/ql/src/test/queries/clientpositive/bucketcontext_7.q
index 2682c7d..32245a5 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_7.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketcontext_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_8.q b/ql/src/test/queries/clientpositive/bucketcontext_8.q
index 60be000..252f74e 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_8.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 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/bucketmapjoin10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin10.q b/ql/src/test/queries/clientpositive/bucketmapjoin10.q
index 4196d2b..a0051b5 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin10.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=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/bucketmapjoin11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin11.q b/ql/src/test/queries/clientpositive/bucketmapjoin11.q
index a4396db..633e388 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin11.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=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/bucketmapjoin12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin12.q b/ql/src/test/queries/clientpositive/bucketmapjoin12.q
index e9d6760..2615f3e 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin12.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=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/bucketmapjoin13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin13.q b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
index 456d155..db437b8 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin13.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin13.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 set hive.exec.reducers.max=1;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucketmapjoin6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin6.q b/ql/src/test/queries/clientpositive/bucketmapjoin6.q
index 9da0619..29ced26 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin6.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 
 -- SORT_QUERY_RESULTS

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucketmapjoin8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin8.q b/ql/src/test/queries/clientpositive/bucketmapjoin8.q
index 7dc0961..4be81c5 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin8.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=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/bucketmapjoin9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin9.q b/ql/src/test/queries/clientpositive/bucketmapjoin9.q
index 57d0bf2..c9539f5 100644
--- a/ql/src/test/queries/clientpositive/bucketmapjoin9.q
+++ b/ql/src/test/queries/clientpositive/bucketmapjoin9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 set hive.strict.checks.bucketing=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/bucketsortoptimize_insert_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
index 8f8d625..5c04de5 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
index 6027707..ee12ab2 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.optimize.bucketmapjoin = true;
 set hive.optimize.bucketmapjoin.sortedmerge = true;
 

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cast_qualified_types.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cast_qualified_types.q b/ql/src/test/queries/clientpositive/cast_qualified_types.q
index 4f977c1..b9c31a1 100644
--- a/ql/src/test/queries/clientpositive/cast_qualified_types.q
+++ b/ql/src/test/queries/clientpositive/cast_qualified_types.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 select
   cast(key as decimal(10,2)) as c1,
   cast(key as char(10)) as c2,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cast_tinyint_to_double.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cast_tinyint_to_double.q b/ql/src/test/queries/clientpositive/cast_tinyint_to_double.q
index 59c5e89..95cc518 100644
--- a/ql/src/test/queries/clientpositive/cast_tinyint_to_double.q
+++ b/ql/src/test/queries/clientpositive/cast_tinyint_to_double.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table t;
 CREATE TABLE t(c tinyint);
 insert overwrite table t select 10 from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cast_to_int.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cast_to_int.q b/ql/src/test/queries/clientpositive/cast_to_int.q
index b1551f2..23caaae 100644
--- a/ql/src/test/queries/clientpositive/cast_to_int.q
+++ b/ql/src/test/queries/clientpositive/cast_to_int.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- cast string floats to integer types

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/cbo_SortUnionTransposeRule.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/cbo_SortUnionTransposeRule.q b/ql/src/test/queries/clientpositive/cbo_SortUnionTransposeRule.q
index 9c8c4be..1b2925e 100644
--- a/ql/src/test/queries/clientpositive/cbo_SortUnionTransposeRule.q
+++ b/ql/src/test/queries/clientpositive/cbo_SortUnionTransposeRule.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 create table s as select * from src limit 10;

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