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:51 UTC
[07/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/reduce_deduplicate_exclude_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reduce_deduplicate_exclude_join.q b/ql/src/test/queries/clientpositive/reduce_deduplicate_exclude_join.q
index ff09754..93e1cb4 100644
--- a/ql/src/test/queries/clientpositive/reduce_deduplicate_exclude_join.q
+++ b/ql/src/test/queries/clientpositive/reduce_deduplicate_exclude_join.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.optimize.reducededuplication=true;
set hive.auto.convert.join=true;
explain select * from (select * from src cluster by key) a join src b on a.key = b.key limit 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
index 8c9ff66..f05fa9f 100644
--- a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
+++ b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.reducededuplication=true;
set hive.optimize.reducededuplication.min.reducer=1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/reduce_deduplicate_extended2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended2.q b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended2.q
index cd67f4c..f88fd50 100644
--- a/ql/src/test/queries/clientpositive/reduce_deduplicate_extended2.q
+++ b/ql/src/test/queries/clientpositive/reduce_deduplicate_extended2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/reducesink_dedup.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reducesink_dedup.q b/ql/src/test/queries/clientpositive/reducesink_dedup.q
index d429a1f..352a558 100644
--- a/ql/src/test/queries/clientpositive/reducesink_dedup.q
+++ b/ql/src/test/queries/clientpositive/reducesink_dedup.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
select p_name
from (select p_name from part distribute by 1 sort by 1) p
distribute by 1 sort by 1
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/regex_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/regex_col.q b/ql/src/test/queries/clientpositive/regex_col.q
index 774cb62..d422f75 100644
--- a/ql/src/test/queries/clientpositive/regex_col.q
+++ b/ql/src/test/queries/clientpositive/regex_col.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.support.quoted.identifiers=none;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/regexp_extract.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/regexp_extract.q b/ql/src/test/queries/clientpositive/regexp_extract.q
index 2074eea..678b8fa 100644
--- a/ql/src/test/queries/clientpositive/regexp_extract.q
+++ b/ql/src/test/queries/clientpositive/regexp_extract.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
EXPLAIN EXTENDED
FROM (
FROM src
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/reloadJar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/reloadJar.q b/ql/src/test/queries/clientpositive/reloadJar.q
index 6768a4f..e7a50e1 100644
--- a/ql/src/test/queries/clientpositive/reloadJar.q
+++ b/ql/src/test/queries/clientpositive/reloadJar.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
dfs -mkdir ${system:test.tmp.dir}/aux;
dfs -cp ${system:hive.root}/data/files/identity_udf.jar ${system:test.tmp.dir}/aux/udfexample.jar;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/remote_script.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/remote_script.q b/ql/src/test/queries/clientpositive/remote_script.q
index ba0d00f..19657bc 100644
--- a/ql/src/test/queries/clientpositive/remote_script.q
+++ b/ql/src/test/queries/clientpositive/remote_script.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
dfs -put ../../data/scripts/newline.py /newline.py;
add file hdfs:///newline.py;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/rename_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_column.q b/ql/src/test/queries/clientpositive/rename_column.q
index a211cfa..96daf9d 100644
--- a/ql/src/test/queries/clientpositive/rename_column.q
+++ b/ql/src/test/queries/clientpositive/rename_column.q
@@ -23,7 +23,7 @@ ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b;
DESCRIBE kv_rename_test;
DROP TABLE kv_rename_test;
-SHOW TABLES;
+SHOW TABLES LIKE "kv_rename_*";
-- Using non-default Database
CREATE DATABASE kv_rename_test_db;
@@ -54,4 +54,4 @@ ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b;
DESCRIBE kv_rename_test;
reset hive.metastore.disallow.incompatible.col.type.changes;
DROP TABLE kv_rename_test;
-SHOW TABLES;
+SHOW TABLES LIKE "kv_rename_*";
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/rename_external_partition_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_external_partition_location.q b/ql/src/test/queries/clientpositive/rename_external_partition_location.q
index 44500d3..d9625e9 100644
--- a/ql/src/test/queries/clientpositive/rename_external_partition_location.q
+++ b/ql/src/test/queries/clientpositive/rename_external_partition_location.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/ex_table;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/rename_partition_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_partition_location.q b/ql/src/test/queries/clientpositive/rename_partition_location.q
index 583c10a..09114d6 100644
--- a/ql/src/test/queries/clientpositive/rename_partition_location.q
+++ b/ql/src/test/queries/clientpositive/rename_partition_location.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
-- This test verifies that if the tables location changes, renaming a partition will not change
-- the partition location accordingly
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/rename_table_location.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_table_location.q b/ql/src/test/queries/clientpositive/rename_table_location.q
index a2103ee..1523dbb 100644
--- a/ql/src/test/queries/clientpositive/rename_table_location.q
+++ b/ql/src/test/queries/clientpositive/rename_table_location.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
-- This test verifies that if the tables location changes, renaming a table will not change
-- the table location scheme
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/rename_table_update_column_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/rename_table_update_column_stats.q b/ql/src/test/queries/clientpositive/rename_table_update_column_stats.q
index 8e5766c..c220d44 100644
--- a/ql/src/test/queries/clientpositive/rename_table_update_column_stats.q
+++ b/ql/src/test/queries/clientpositive/rename_table_update_column_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.metastore.try.direct.sql=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/resourceplan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/resourceplan.q b/ql/src/test/queries/clientpositive/resourceplan.q
index bb5266a..4cbdede 100644
--- a/ql/src/test/queries/clientpositive/resourceplan.q
+++ b/ql/src/test/queries/clientpositive/resourceplan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc,alltypesparquet,cbo_t1,cbo_t2,cbo_t3,lineitem,part,src,src1,src_cbo,src_json,src_sequencefile,src_thrift,srcbucket,srcbucket2,srcpart
-- Continue on errors, we do check some error conditions below.
set hive.cli.errors.ignore=true;
set hive.test.authz.sstd.hs2.mode=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_1.q b/ql/src/test/queries/clientpositive/results_cache_1.q
index 4aea60e..b4149fd 100644
--- a/ql/src/test/queries/clientpositive/results_cache_1.q
+++ b/ql/src/test/queries/clientpositive/results_cache_1.q
@@ -1,3 +1,7 @@
+--! qt:dataset:src
+--! qt:dataset:cbo_t3
+--! qt:dataset:cbo_t2
+--! qt:dataset:cbo_t1
set hive.query.results.cache.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_2.q b/ql/src/test/queries/clientpositive/results_cache_2.q
index 96a9092..2fbb381 100644
--- a/ql/src/test/queries/clientpositive/results_cache_2.q
+++ b/ql/src/test/queries/clientpositive/results_cache_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.query.results.cache.enabled=true;
set hive.fetch.task.conversion=more;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_capacity.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_capacity.q b/ql/src/test/queries/clientpositive/results_cache_capacity.q
index 9f54577..c29ff29 100644
--- a/ql/src/test/queries/clientpositive/results_cache_capacity.q
+++ b/ql/src/test/queries/clientpositive/results_cache_capacity.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.query.results.cache.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_empty_result.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_empty_result.q b/ql/src/test/queries/clientpositive/results_cache_empty_result.q
index 6213671..a18a6c0 100644
--- a/ql/src/test/queries/clientpositive/results_cache_empty_result.q
+++ b/ql/src/test/queries/clientpositive/results_cache_empty_result.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.query.results.cache.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_lifetime.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_lifetime.q b/ql/src/test/queries/clientpositive/results_cache_lifetime.q
index 60ffe96..1140404 100644
--- a/ql/src/test/queries/clientpositive/results_cache_lifetime.q
+++ b/ql/src/test/queries/clientpositive/results_cache_lifetime.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.query.results.cache.enabled=true;
set hive.query.results.cache.max.entry.lifetime=2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_quoted_identifiers.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_quoted_identifiers.q b/ql/src/test/queries/clientpositive/results_cache_quoted_identifiers.q
index 4802f43..29595ed 100644
--- a/ql/src/test/queries/clientpositive/results_cache_quoted_identifiers.q
+++ b/ql/src/test/queries/clientpositive/results_cache_quoted_identifiers.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table quoted1 (
`_c1` int,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_temptable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_temptable.q b/ql/src/test/queries/clientpositive/results_cache_temptable.q
index 9e0de76..fc41722 100644
--- a/ql/src/test/queries/clientpositive/results_cache_temptable.q
+++ b/ql/src/test/queries/clientpositive/results_cache_temptable.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.query.results.cache.enabled=true;
create table rct (key string, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/results_cache_with_masking.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/results_cache_with_masking.q b/ql/src/test/queries/clientpositive/results_cache_with_masking.q
index b4fcdd5..e9e7982 100644
--- a/ql/src/test/queries/clientpositive/results_cache_with_masking.q
+++ b/ql/src/test/queries/clientpositive/results_cache_with_masking.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/retry_failure.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/retry_failure.q b/ql/src/test/queries/clientpositive/retry_failure.q
index 0b9922b..ddc575f 100644
--- a/ql/src/test/queries/clientpositive/retry_failure.q
+++ b/ql/src/test/queries/clientpositive/retry_failure.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table tx(a int,f string);
insert into tx values (1,'non_existent_file');
@@ -8,4 +9,3 @@ set hive.query.reexecution.enabled=true;
set hive.query.reexecution.strategies=overlay;
select assert_true(${hiveconf:zzz} > a) from tx group by a;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/root_dir_external_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/root_dir_external_table.q b/ql/src/test/queries/clientpositive/root_dir_external_table.q
index a242ca7..a08d640 100644
--- a/ql/src/test/queries/clientpositive/root_dir_external_table.q
+++ b/ql/src/test/queries/clientpositive/root_dir_external_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_root_dir_external_table;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/router_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/router_join_ppr.q b/ql/src/test/queries/clientpositive/router_join_ppr.q
index d659944..0984f90 100644
--- a/ql/src/test/queries/clientpositive/router_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/router_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/runtime_skewjoin_mapjoin_spark.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q b/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
index ca9e9cf..7ebe127 100644
--- a/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
+++ b/ql/src/test/queries/clientpositive/runtime_skewjoin_mapjoin_spark.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.stats.deserialization.factor=1.0;
set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample1.q b/ql/src/test/queries/clientpositive/sample1.q
index 6e86cef..16c5bcd 100644
--- a/ql/src/test/queries/clientpositive/sample1.q
+++ b/ql/src/test/queries/clientpositive/sample1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:srcbucket
CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE;
-- no input pruning, no sample filter
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample10.q b/ql/src/test/queries/clientpositive/sample10.q
index a5a8c8f..7c2de2e 100644
--- a/ql/src/test/queries/clientpositive/sample10.q
+++ b/ql/src/test/queries/clientpositive/sample10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample2.q b/ql/src/test/queries/clientpositive/sample2.q
index 119afc9..b9edb7d 100644
--- a/ql/src/test/queries/clientpositive/sample2.q
+++ b/ql/src/test/queries/clientpositive/sample2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
-- input pruning, no sample filter
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample3.q b/ql/src/test/queries/clientpositive/sample3.q
index fe001a3..0318e64 100644
--- a/ql/src/test/queries/clientpositive/sample3.q
+++ b/ql/src/test/queries/clientpositive/sample3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
-- SORT_QUERY_RESULTS
-- no input pruning, sample filter
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample4.q b/ql/src/test/queries/clientpositive/sample4.q
index 0fa55f7..49d7418 100644
--- a/ql/src/test/queries/clientpositive/sample4.q
+++ b/ql/src/test/queries/clientpositive/sample4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
-- bucket column is the same as table sample
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample5.q b/ql/src/test/queries/clientpositive/sample5.q
index ddbeac0..5cb6ffd 100644
--- a/ql/src/test/queries/clientpositive/sample5.q
+++ b/ql/src/test/queries/clientpositive/sample5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample6.q b/ql/src/test/queries/clientpositive/sample6.q
index 0e094b1..6972897 100644
--- a/ql/src/test/queries/clientpositive/sample6.q
+++ b/ql/src/test/queries/clientpositive/sample6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcbucket2
+--! qt:dataset:srcbucket
set hive.mapred.mode=nonstrict;
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/sample7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample7.q b/ql/src/test/queries/clientpositive/sample7.q
index 20584aa..e8f5336 100644
--- a/ql/src/test/queries/clientpositive/sample7.q
+++ b/ql/src/test/queries/clientpositive/sample7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
-- both input pruning and sample filter
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample8.q b/ql/src/test/queries/clientpositive/sample8.q
index d53d510..33304f4 100644
--- a/ql/src/test/queries/clientpositive/sample8.q
+++ b/ql/src/test/queries/clientpositive/sample8.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- sampling with join and alias
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample9.q b/ql/src/test/queries/clientpositive/sample9.q
index 13cc04f..46949cd 100644
--- a/ql/src/test/queries/clientpositive/sample9.q
+++ b/ql/src/test/queries/clientpositive/sample9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcbucket
EXPLAIN EXTENDED
SELECT s.*
FROM (SELECT a.* FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) a) s;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
index 08f8cdf..1518529 100644
--- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
+++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q
index 7429932..772b8a8 100644
--- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q
+++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
USE default;
set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q
index b523f06..cb80ef4 100644
--- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q
+++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
index e2e356e..df52696 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
index 1e5f69b..3d13f76 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update.q
index b58bb56..70f8cc9 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:part
+--! qt:dataset:alltypesorc
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update_llap_io.q
index 2f82583..0d528ea 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acid_part_update_llap_io.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:part
+--! qt:dataset:alltypesorc
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
index fb86392..d84f476 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
index 7509d3d..a632855 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update.q
index aba65c9..760deb4 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update_llap_io.q
index 6191d34..3ece477 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_part_update_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
index c4acf27..c15792e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
index 614a5be..76e2f57 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
index c401b25..a2800b5 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_complex_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q
index c2d8308..336a9ad 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q
index a91fcef..b1b414d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
index bb9bb01..52f10e1 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
index d814870..d401679 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex.q
index bff7cca..91b3c4e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex_llap_io.q
index af6129e..d79bc82 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_complex_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q
index 76ab011..552c25d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q
index d7eb636..2132cfa 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
index 52535dd..9978227 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_stats.q b/ql/src/test/queries/clientpositive/schema_evol_stats.q
index 210146b..6a5688a 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_stats.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
SET hive.exec.schema.evolution=true;
set hive.llap.io.enabled=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
index 6746fae..159f326 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex.q
index 7c846e7..c444246 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex_llap_io.q
index c679ea9..0bc9f83 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_complex_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive.q
index 3f2f9ed..5d91055 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
index 4bd2f30..93494c0 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_all_primitive_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
index ca2cfda..821f8cf 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_nonvec_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
index 0b322b0..142ab28 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex.q
index 131a1af..dc870be 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex_llap_io.q
index c19d32d..8e0c780 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_complex_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive.q
index 2448268..b86423b 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive_llap_io.q
index e72c749..b64ed2d 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_all_primitive_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
index 4cd3ad7..4cf867c 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vec_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
index 0ab1f33..0668513 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex.q
index b4a9d66..55163c8 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex_llap_io.q
index 6368d82..09f06d3 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_complex_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive.q
index 83fc173..d9ff65e 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive_llap_io.q
index a191d79..28885c8 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_all_primitive_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
index 4a91a95..2017955 100644
--- a/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
+++ b/ql/src/test/queries/clientpositive/schema_evol_text_vecrow_part_llap_io.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.explain.user=false;
set hive.fetch.task.conversion=none;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schemeAuthority.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority.q b/ql/src/test/queries/clientpositive/schemeAuthority.q
index 6f545b1..15713f0 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
dfs ${system:test.dfs.mkdir} file:///tmp/test;
dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schemeAuthority2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority2.q b/ql/src/test/queries/clientpositive/schemeAuthority2.q
index 7f87909..cfb4be8 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority2.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
dfs ${system:test.dfs.mkdir} file:///tmp/test;
dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/schemeAuthority3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/schemeAuthority3.q b/ql/src/test/queries/clientpositive/schemeAuthority3.q
index 4a7f5c5..9bdc669 100644
--- a/ql/src/test/queries/clientpositive/schemeAuthority3.q
+++ b/ql/src/test/queries/clientpositive/schemeAuthority3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
create table noschemeTable(key string) partitioned by (value string, value2 string) row format delimited fields terminated by '\\t' stored as textfile;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/script_env_var1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/script_env_var1.q b/ql/src/test/queries/clientpositive/script_env_var1.q
index 77d9945..54e7e3f 100644
--- a/ql/src/test/queries/clientpositive/script_env_var1.q
+++ b/ql/src/test/queries/clientpositive/script_env_var1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- Verifies that script operator ID environment variables have unique values
-- in each instance of the script operator.
SELECT count(1) FROM
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/script_env_var2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/script_env_var2.q b/ql/src/test/queries/clientpositive/script_env_var2.q
index 01e399b..f1badef 100644
--- a/ql/src/test/queries/clientpositive/script_env_var2.q
+++ b/ql/src/test/queries/clientpositive/script_env_var2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.script.operator.id.env.var = MY_ID;
-- Same test as script_env_var1, but test setting the variable name
SELECT count(1) FROM
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/script_pipe.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/script_pipe.q b/ql/src/test/queries/clientpositive/script_pipe.q
index 95a08dd..350a693 100644
--- a/ql/src/test/queries/clientpositive/script_pipe.q
+++ b/ql/src/test/queries/clientpositive/script_pipe.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.explain.user=false;
set hive.exec.script.allow.partial.consumption = true;
-- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/scriptfile1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/scriptfile1.q b/ql/src/test/queries/clientpositive/scriptfile1.q
index 988cdca..9604c57 100644
--- a/ql/src/test/queries/clientpositive/scriptfile1.q
+++ b/ql/src/test/queries/clientpositive/scriptfile1.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/selectDistinctStar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q b/ql/src/test/queries/clientpositive/selectDistinctStar.q
index 3168531..05542ce 100644
--- a/ql/src/test/queries/clientpositive/selectDistinctStar.q
+++ b/ql/src/test/queries/clientpositive/selectDistinctStar.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_as_omitted.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_as_omitted.q b/ql/src/test/queries/clientpositive/select_as_omitted.q
index f0fe03f..aa3a31c 100644
--- a/ql/src/test/queries/clientpositive/select_as_omitted.q
+++ b/ql/src/test/queries/clientpositive/select_as_omitted.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
EXPLAIn
SELECT a, b FROM (
SELECT key a, value b
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_column_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_column_pruning.q b/ql/src/test/queries/clientpositive/select_column_pruning.q
index 207cd32..b7083d8 100644
--- a/ql/src/test/queries/clientpositive/select_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/select_column_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
CREATE TABLE lv_table1( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1), c5 STRING, c6 STRING, c7 STRING, c8 STRING, c9 STRING, c10 STRING, c11 STRING);
INSERT OVERWRITE TABLE lv_table1 SELECT 'abc ', array(1,2,3), 100, 't', 'test', 'test', 'test', 'test', 'test', 'test', 'test' FROM src;
EXPLAIN SELECT * FROM lv_table1 LATERAL VIEW explode(array(1,2,3)) myTable AS myCol WHERE c3 = 100 SORT BY c1 ASC, myCol ASC LIMIT 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_same_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_same_col.q b/ql/src/test/queries/clientpositive/select_same_col.q
index 96bed1a..1c62a7c 100644
--- a/ql/src/test/queries/clientpositive/select_same_col.q
+++ b/ql/src/test/queries/clientpositive/select_same_col.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/select_transform_hint.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_transform_hint.q b/ql/src/test/queries/clientpositive/select_transform_hint.q
index b5a8147..39577d1 100644
--- a/ql/src/test/queries/clientpositive/select_transform_hint.q
+++ b/ql/src/test/queries/clientpositive/select_transform_hint.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.entity.capture.transform=true;
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_unquote_and.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_and.q b/ql/src/test/queries/clientpositive/select_unquote_and.q
index 529cbc3..79894ea 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_and.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_and.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_unquote_not.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_not.q b/ql/src/test/queries/clientpositive/select_unquote_not.q
index b5f3a67..ee5d304 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_not.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_not.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/select_unquote_or.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/select_unquote_or.q b/ql/src/test/queries/clientpositive/select_unquote_or.q
index 79ef863..6e60f41 100644
--- a/ql/src/test/queries/clientpositive/select_unquote_or.q
+++ b/ql/src/test/queries/clientpositive/select_unquote_or.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/semicolon.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semicolon.q b/ql/src/test/queries/clientpositive/semicolon.q
index fef2687..55d5514 100644
--- a/ql/src/test/queries/clientpositive/semicolon.q
+++ b/ql/src/test/queries/clientpositive/semicolon.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- comment
-- comment;
-- comment
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/semijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin.q b/ql/src/test/queries/clientpositive/semijoin.q
index 8f3a6ad..9df6bc2 100644
--- a/ql/src/test/queries/clientpositive/semijoin.q
+++ b/ql/src/test/queries/clientpositive/semijoin.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/semijoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin3.q b/ql/src/test/queries/clientpositive/semijoin3.q
index a502b9b..14442ac 100644
--- a/ql/src/test/queries/clientpositive/semijoin3.q
+++ b/ql/src/test/queries/clientpositive/semijoin3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table t1 as select cast(key as int) key, value from src;
create table t2 as select cast(key as int) key, value from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/semijoin_hint.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/semijoin_hint.q b/ql/src/test/queries/clientpositive/semijoin_hint.q
index 0586dbc..de176af 100644
--- a/ql/src/test/queries/clientpositive/semijoin_hint.q
+++ b/ql/src/test/queries/clientpositive/semijoin_hint.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.cbo.enable=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/serde_user_properties.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/serde_user_properties.q b/ql/src/test/queries/clientpositive/serde_user_properties.q
index 4d523e1..2805a1a 100644
--- a/ql/src/test/queries/clientpositive/serde_user_properties.q
+++ b/ql/src/test/queries/clientpositive/serde_user_properties.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- HIVE-2906 Table properties in SQL
explain extended select key from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/set_processor_namespaces.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/set_processor_namespaces.q b/ql/src/test/queries/clientpositive/set_processor_namespaces.q
index 1f9e282..d496a4d 100644
--- a/ql/src/test/queries/clientpositive/set_processor_namespaces.q
+++ b/ql/src/test/queries/clientpositive/set_processor_namespaces.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set zzz=5;
set zzz;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/set_variable_sub.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/set_variable_sub.q b/ql/src/test/queries/clientpositive/set_variable_sub.q
index 7bf1e60..0804c2d 100644
--- a/ql/src/test/queries/clientpositive/set_variable_sub.q
+++ b/ql/src/test/queries/clientpositive/set_variable_sub.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hivevar:key1=value1;
EXPLAIN SELECT * FROM src where key="${key1}";
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/setop_subq.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/setop_subq.q b/ql/src/test/queries/clientpositive/setop_subq.q
index a88e512..b968a13 100644
--- a/ql/src/test/queries/clientpositive/setop_subq.q
+++ b/ql/src/test/queries/clientpositive/setop_subq.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
explain select key from ((select key from src) union (select key from src))subq;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sharedworkext.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sharedworkext.q b/ql/src/test/queries/clientpositive/sharedworkext.q
index b1801ea..ed42676 100644
--- a/ql/src/test/queries/clientpositive/sharedworkext.q
+++ b/ql/src/test/queries/clientpositive/sharedworkext.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
EXPLAIN
SELECT a.key FROM
(
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/show_create_table_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_create_table_view.q b/ql/src/test/queries/clientpositive/show_create_table_view.q
index a378456..42b7467 100644
--- a/ql/src/test/queries/clientpositive/show_create_table_view.q
+++ b/ql/src/test/queries/clientpositive/show_create_table_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- Test SHOW CREATE TABLE on a view name.
CREATE VIEW tmp_copy_src AS SELECT * FROM src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/show_partitions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_partitions.q b/ql/src/test/queries/clientpositive/show_partitions.q
index 5b746e6..d22c483 100644
--- a/ql/src/test/queries/clientpositive/show_partitions.q
+++ b/ql/src/test/queries/clientpositive/show_partitions.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
SHOW PARTITIONS srcpart;
SHOW PARTITIONS default.srcpart;
SHOW PARTITIONS srcpart PARTITION(hr='11');
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/show_tables.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_tables.q b/ql/src/test/queries/clientpositive/show_tables.q
index 447f9a8..6190657 100644
--- a/ql/src/test/queries/clientpositive/show_tables.q
+++ b/ql/src/test/queries/clientpositive/show_tables.q
@@ -21,9 +21,7 @@ CREATE TABLE baz(a INT);
-- SHOW TABLES basic syntax tests
USE default;
SHOW TABLES FROM test_db;
-SHOW TABLES FROM default;
SHOW TABLES IN test_db;
-SHOW TABLES IN default;
SHOW TABLES IN test_db "test*";
SHOW TABLES IN test_db LIKE "nomatch";
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/show_tablestatus.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_tablestatus.q b/ql/src/test/queries/clientpositive/show_tablestatus.q
index 55fb7b6..d8f04ec 100644
--- a/ql/src/test/queries/clientpositive/show_tablestatus.q
+++ b/ql/src/test/queries/clientpositive/show_tablestatus.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
set hive.support.quoted.identifiers=none;
EXPLAIN
SHOW TABLE EXTENDED IN default LIKE `src`;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/showparts.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/showparts.q b/ql/src/test/queries/clientpositive/showparts.q
index dbee3ef..ea28669 100644
--- a/ql/src/test/queries/clientpositive/showparts.q
+++ b/ql/src/test/queries/clientpositive/showparts.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
EXPLAIN
SHOW PARTITIONS srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/skewjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin.q b/ql/src/test/queries/clientpositive/skewjoin.q
index e4b178a..9972edd 100644
--- a/ql/src/test/queries/clientpositive/skewjoin.q
+++ b/ql/src/test/queries/clientpositive/skewjoin.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.optimize.skewjoin = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/skewjoin_noskew.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/skewjoin_noskew.q b/ql/src/test/queries/clientpositive/skewjoin_noskew.q
index 228373c..8678c28 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_noskew.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_noskew.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.auto.convert.join=false;
set hive.optimize.skewjoin=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin9.q b/ql/src/test/queries/clientpositive/smb_mapjoin9.q
index e915951..653f4a8 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin9.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table hive_test_smb_bucket1 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets;
create table hive_test_smb_bucket2 (key int, value string) partitioned by (ds 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/smb_mapjoin_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
index 66bdff1..ebab7b9 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
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/smb_mapjoin_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_12.q b/ql/src/test/queries/clientpositive/smb_mapjoin_12.q
index c209308..136b423 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_12.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_13.q b/ql/src/test/queries/clientpositive/smb_mapjoin_13.q
index 6cba8ea..728ec15 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_13.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q b/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
index f0b0e6e..25457d5 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_14.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_14.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/smb_mapjoin_15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_15.q b/ql/src/test/queries/clientpositive/smb_mapjoin_15.q
index 4a16c0d..b4539c5 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_15.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_15.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_16.q b/ql/src/test/queries/clientpositive/smb_mapjoin_16.q
index 4bf6379..b4fe074 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_16.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_16.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.optimize.bucketmapjoin = true;
set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
index 3374693..2b7d7d1 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_17.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
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/smb_mapjoin_18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_18.q b/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
index a89bc1c..71d9973 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_18.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/smb_mapjoin_19.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_19.q b/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
index 01972c9..1026cf1 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_19.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/smb_mapjoin_20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_20.q b/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
index c01d587..94842ba 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_BEFORE_DIFF
set hive.optimize.bucketmapjoin = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_21.q b/ql/src/test/queries/clientpositive/smb_mapjoin_21.q
index 08b13aa..7d7dede 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_21.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_21.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/smb_mapjoin_22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_22.q b/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
index 2f1a6b6..4c5fcf7 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_22.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/smb_mapjoin_25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
index 491db2e..a6214c2 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_25.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
index ab95b46..cb7e540 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
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/smb_mapjoin_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
index fed931c..eb4164e 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort.q b/ql/src/test/queries/clientpositive/sort.q
index e46d787..cab2712 100644
--- a/ql/src/test/queries/clientpositive/sort.q
+++ b/ql/src/test/queries/clientpositive/sort.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_1.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_1.q
index c02f500..1547cdf 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_1.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table table_desc1;
drop table table_desc2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_2.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_2.q
index 6044c51..9453ed8 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_2.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table table_desc1;
drop table table_desc2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_3.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_3.q
index 2a5e6e2..f8cb824 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_3.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table table_desc1;
drop table table_desc2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_4.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_4.q
index 3b23304..494168d 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_4.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table table_desc1;
drop table table_desc2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_5.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_5.q
index 5be80b4..fbe8e5b 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_5.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_5.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.cbo.enable=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_6.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_6.q
index 0c0422f..7d4dfdf 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_6.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.exec.reducers.max = 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_7.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_7.q
index 3be7c2d..8b65854 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_7.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.exec.reducers.max = 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/sort_merge_join_desc_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/sort_merge_join_desc_8.q b/ql/src/test/queries/clientpositive/sort_merge_join_desc_8.q
index 89d2c9d..5903fae 100644
--- a/ql/src/test/queries/clientpositive/sort_merge_join_desc_8.q
+++ b/ql/src/test/queries/clientpositive/sort_merge_join_desc_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table table_desc1;
drop table table_desc2;
drop table table_desc3;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_combine_equivalent_work_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_combine_equivalent_work_2.q b/ql/src/test/queries/clientpositive/spark_combine_equivalent_work_2.q
index 2ff786a..2176737 100644
--- a/ql/src/test/queries/clientpositive/spark_combine_equivalent_work_2.q
+++ b/ql/src/test/queries/clientpositive/spark_combine_equivalent_work_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
index 71a7399..285d7c2 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=true;
set hive.spark.dynamic.partition.pruning=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
index 2202709..2483424 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=true;
set hive.spark.dynamic.partition.pruning=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
index e5f4874..4e8bd1a 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.spark.dynamic.partition.pruning=true;
set hive.combine.equivalent.work.optimization=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
index 4883787..c5c6a95 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.spark.dynamic.partition.pruning=true;
-- This qfile tests whether we can handle nested DPP sinks
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
index 7c2164d..468dea4 100644
--- a/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
+++ b/ql/src/test/queries/clientpositive/spark_dynamic_partition_pruning_mapjoin_only.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.optimize.ppd=true;
set hive.ppd.remove.duplicatefilters=true;
set hive.optimize.metadataonly=false;