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

[15/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/clientnegative/subquery_exists_implicit_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q b/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
index 497f3c2..6650dc2 100644
--- a/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
+++ b/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 select *

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_in_groupby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_in_groupby.q b/ql/src/test/queries/clientnegative/subquery_in_groupby.q
index a9bc6ee..74e9a07 100644
--- a/ql/src/test/queries/clientnegative/subquery_in_groupby.q
+++ b/ql/src/test/queries/clientnegative/subquery_in_groupby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 select count(*) 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_in_lhs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_in_lhs.q b/ql/src/test/queries/clientnegative/subquery_in_lhs.q
index 087c3f3..e24de1e 100644
--- a/ql/src/test/queries/clientnegative/subquery_in_lhs.q
+++ b/ql/src/test/queries/clientnegative/subquery_in_lhs.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 
 select * from part where (select max(p_size) from part) IN (select p_size from part);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_in_on.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_in_on.q b/ql/src/test/queries/clientnegative/subquery_in_on.q
index 5f44f72..fb30d44 100644
--- a/ql/src/test/queries/clientnegative/subquery_in_on.q
+++ b/ql/src/test/queries/clientnegative/subquery_in_on.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- subquery in ON clause
 explain SELECT p1.p_name FROM part p1 LEFT JOIN (select p_type as p_col from part ) p2
     ON (select pp1.p_type as p_col from part pp1 where pp1.p_partkey = p2.p_col);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q b/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
index 6805c5b..c7a53e0 100644
--- a/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
+++ b/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q b/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
index 57c72d2..63847bf 100644
--- a/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
+++ b/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 
 select *

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_scalar_corr_multi_rows.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_scalar_corr_multi_rows.q b/ql/src/test/queries/clientnegative/subquery_scalar_corr_multi_rows.q
index e71a60d..47fb513 100644
--- a/ql/src/test/queries/clientnegative/subquery_scalar_corr_multi_rows.q
+++ b/ql/src/test/queries/clientnegative/subquery_scalar_corr_multi_rows.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- inner query produces more than one row
 select * from part where p_size >
     (select count(*) from part p where p.p_mfgr = part.p_mfgr group by p_type);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_scalar_multi_columns.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_scalar_multi_columns.q b/ql/src/test/queries/clientnegative/subquery_scalar_multi_columns.q
index 1f6ad1a..948ed0e 100644
--- a/ql/src/test/queries/clientnegative/subquery_scalar_multi_columns.q
+++ b/ql/src/test/queries/clientnegative/subquery_scalar_multi_columns.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 select p_name from part where p_size > (select p_size, p_type from part);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_scalar_multi_rows.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_scalar_multi_rows.q b/ql/src/test/queries/clientnegative/subquery_scalar_multi_rows.q
index 14b68b9..77f4f08 100644
--- a/ql/src/test/queries/clientnegative/subquery_scalar_multi_rows.q
+++ b/ql/src/test/queries/clientnegative/subquery_scalar_multi_rows.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 set hive.mapred.mode=nonstrict;
 select p_name from part where p_size > (select p_size from part);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_select_aggregate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_select_aggregate.q b/ql/src/test/queries/clientnegative/subquery_select_aggregate.q
index 8da8521..8bd4460 100644
--- a/ql/src/test/queries/clientnegative/subquery_select_aggregate.q
+++ b/ql/src/test/queries/clientnegative/subquery_select_aggregate.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 -- subqueries in UDFs are not allowed
 explain SELECT count((SELECT max(p_size) FROM part p WHERE p.p_type = part.p_type)) from part;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_select_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_select_distinct.q b/ql/src/test/queries/clientnegative/subquery_select_distinct.q
index 5682ae7..34ee8cb 100644
--- a/ql/src/test/queries/clientnegative/subquery_select_distinct.q
+++ b/ql/src/test/queries/clientnegative/subquery_select_distinct.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 -- subqueries in UDFs are not allowed
 explain SELECT distinct (SELECT max(p_size) FROM part p WHERE p.p_type = part.p_type) from part;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_select_distinct2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_select_distinct2.q b/ql/src/test/queries/clientnegative/subquery_select_distinct2.q
index 90c0588..060dd3a 100644
--- a/ql/src/test/queries/clientnegative/subquery_select_distinct2.q
+++ b/ql/src/test/queries/clientnegative/subquery_select_distinct2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:part
 -- subqueries in UDFs are not allowed
 explain SELECT distinct p_size, (SELECT max(p_size) FROM part p WHERE p.p_type = part.p_type) from part;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_subquery_chain.q b/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
index 8ea94c5..a969d37 100644
--- a/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
+++ b/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 
 explain
 select * 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_subquery_chain_exists.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_subquery_chain_exists.q b/ql/src/test/queries/clientnegative/subquery_subquery_chain_exists.q
index 0a771e2..497a548 100644
--- a/ql/src/test/queries/clientnegative/subquery_subquery_chain_exists.q
+++ b/ql/src/test/queries/clientnegative/subquery_subquery_chain_exists.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 explain
 select *
 from src

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/subquery_windowing_corr.q b/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
index ac15310..86cad1e 100644
--- a/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
+++ b/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 -- corr and windowing 
 select p_mfgr, p_name, p_size 
 from part a 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/touch1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/touch1.q b/ql/src/test/queries/clientnegative/touch1.q
index 9efbba0..8cc2b91 100644
--- a/ql/src/test/queries/clientnegative/touch1.q
+++ b/ql/src/test/queries/clientnegative/touch1.q
@@ -1 +1,2 @@
+--! qt:dataset:srcpart
 ALTER TABLE srcpart TOUCH PARTITION (ds='2008-04-08', hr='13');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/touch2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/touch2.q b/ql/src/test/queries/clientnegative/touch2.q
index 923a171..c96ba42 100644
--- a/ql/src/test/queries/clientnegative/touch2.q
+++ b/ql/src/test/queries/clientnegative/touch2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 ALTER TABLE src TOUCH PARTITION (ds='2008-04-08', hr='12');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_bucketed_column.q b/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
index e536656..955802e 100644
--- a/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
+++ b/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Tests truncating a bucketed column
 
 CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q b/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
index 90f6cf7..70cbce8 100644
--- a/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
+++ b/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set mapred.input.dir.recursive=true;
 
 -- Tests truncating a column on which a table is list bucketed

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_column_seqfile.q b/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
index 903540d..4e42935 100644
--- a/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
+++ b/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Tests truncating a column from a table stored as a sequence file
 
 CREATE TABLE test_tab (key STRING, value STRING) STORED AS SEQUENCEFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q b/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
index 5509552..08d07e5 100644
--- a/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
+++ b/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Tests attempting to truncate a column in a table that doesn't exist
 
 CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_partition_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_partition_column.q b/ql/src/test/queries/clientnegative/truncate_partition_column.q
index 134743a..40b8735 100644
--- a/ql/src/test/queries/clientnegative/truncate_partition_column.q
+++ b/ql/src/test/queries/clientnegative/truncate_partition_column.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- Tests truncating a partition column
 
 CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_partition_column2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_partition_column2.q b/ql/src/test/queries/clientnegative/truncate_partition_column2.q
index 4763520..e90db9b 100644
--- a/ql/src/test/queries/clientnegative/truncate_partition_column2.q
+++ b/ql/src/test/queries/clientnegative/truncate_partition_column2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 -- Tests truncating a partition column
 
 CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_table_failure1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_table_failure1.q b/ql/src/test/queries/clientnegative/truncate_table_failure1.q
index f6cfa44..ac59138 100644
--- a/ql/src/test/queries/clientnegative/truncate_table_failure1.q
+++ b/ql/src/test/queries/clientnegative/truncate_table_failure1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- partition spec for non-partitioned table
 TRUNCATE TABLE src partition (ds='2008-04-08', hr='11');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/truncate_table_failure2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/truncate_table_failure2.q b/ql/src/test/queries/clientnegative/truncate_table_failure2.q
index 1137d89..2959b1d 100644
--- a/ql/src/test/queries/clientnegative/truncate_table_failure2.q
+++ b/ql/src/test/queries/clientnegative/truncate_table_failure2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:srcpart
 -- full partition spec for not existing partition
 TRUNCATE TABLE srcpart partition (ds='2012-12-17', hr='15');

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udaf_collect_set_unsupported.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udaf_collect_set_unsupported.q b/ql/src/test/queries/clientnegative/udaf_collect_set_unsupported.q
index ed03620..9ba443e 100644
--- a/ql/src/test/queries/clientnegative/udaf_collect_set_unsupported.q
+++ b/ql/src/test/queries/clientnegative/udaf_collect_set_unsupported.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT key, collect_set(create_union(value))
 FROM src
 GROUP BY key ORDER BY key limit 20;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udaf_invalid_place.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udaf_invalid_place.q b/ql/src/test/queries/clientnegative/udaf_invalid_place.q
index f37ce72..3411aa2 100644
--- a/ql/src/test/queries/clientnegative/udaf_invalid_place.q
+++ b/ql/src/test/queries/clientnegative/udaf_invalid_place.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select distinct key, sum(key) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q b/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
index c2a132d..edc8369 100644
--- a/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid first argument
 SELECT array_contains(1, 2) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q b/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
index 36f85d3..f7c0e74 100644
--- a/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid second argument
 SELECT array_contains(array(1, 2, 3), '2') FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_assert_true.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_assert_true.q b/ql/src/test/queries/clientnegative/udf_assert_true.q
index 73b3f96..1b5b2a0 100644
--- a/ql/src/test/queries/clientnegative/udf_assert_true.q
+++ b/ql/src/test/queries/clientnegative/udf_assert_true.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION ASSERT_TRUE;
 
 EXPLAIN SELECT ASSERT_TRUE(x > 0) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_assert_true2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_assert_true2.q b/ql/src/test/queries/clientnegative/udf_assert_true2.q
index 4b62220..738ff3b 100644
--- a/ql/src/test/queries/clientnegative/udf_assert_true2.q
+++ b/ql/src/test/queries/clientnegative/udf_assert_true2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 EXPLAIN SELECT 1 + ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
 SELECT 1 + ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_coalesce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_coalesce.q b/ql/src/test/queries/clientnegative/udf_coalesce.q
index 7405e38..bb4718e 100644
--- a/ql/src/test/queries/clientnegative/udf_coalesce.q
+++ b/ql/src/test/queries/clientnegative/udf_coalesce.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT COALESCE(array('a', 'b'), '2.0') FROM src LIMIT 1; 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
index 8c2017b..6aca60f 100644
--- a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument number
 SELECT concat_ws('-') FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
index c49e786..dc65846 100644
--- a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT concat_ws('[]', array(100, 200, 50)) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
index 72b8627..0356cd8 100644
--- a/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
+++ b/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT concat_ws(1234, array('www', 'facebook', 'com')) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
index fbe4902..4c3e64d 100644
--- a/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT elt(3) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q b/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
index bb1fdbf..8581dbb 100644
--- a/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
+++ b/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 FROM src_thrift
 SELECT elt(1, src_thrift.lintstring)
 WHERE src_thrift.lintstring IS NOT NULL;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
index 9703c82..2bed0ec 100644
--- a/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT field(3) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_field_wrong_type.q b/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
index 61b2cd0..5b9c58e 100644
--- a/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
+++ b/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 FROM src_thrift
 SELECT field(1, src_thrift.lintstring)
 WHERE src_thrift.lintstring IS NOT NULL;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
index 18c985c..03b4a29 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument length
 SELECT format_number(12332.123456) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
index 7959c20..4ccadaf 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument length
 SELECT format_number(12332.123456, 2, 3) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
index 7d90ef8..5837502 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument(second argument should be >= 0)
 SELECT format_number(12332.123456, -4) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
index e545f4a..0ac54c0 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT format_number(12332.123456, 4.01) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
index a6f7177..7935562 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT format_number(array(12332.123456, 321.23), 5) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q b/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
index aa4a3a4..17b888d 100644
--- a/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
+++ b/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type(format_number returns the result as a string)
 SELECT format_number(format_number(12332.123456, 4), 2) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_greatest_error_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_greatest_error_1.q b/ql/src/test/queries/clientnegative/udf_greatest_error_1.q
index e3347ed..2927be5 100644
--- a/ql/src/test/queries/clientnegative/udf_greatest_error_1.q
+++ b/ql/src/test/queries/clientnegative/udf_greatest_error_1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT GREATEST(array('a', 'b'), '2.0') FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_greatest_error_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_greatest_error_2.q b/ql/src/test/queries/clientnegative/udf_greatest_error_2.q
index ae6d928..ba99347 100644
--- a/ql/src/test/queries/clientnegative/udf_greatest_error_2.q
+++ b/ql/src/test/queries/clientnegative/udf_greatest_error_2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT GREATEST(1) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_if_not_bool.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_if_not_bool.q b/ql/src/test/queries/clientnegative/udf_if_not_bool.q
index 74458d0..6052d49 100644
--- a/ql/src/test/queries/clientnegative/udf_if_not_bool.q
+++ b/ql/src/test/queries/clientnegative/udf_if_not_bool.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT IF('STRING', 1, 1) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
index ad19364..ef97f0b 100644
--- a/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT IF(TRUE, 1) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_in.q b/ql/src/test/queries/clientnegative/udf_in.q
index ce9ce54..9ede156 100644
--- a/ql/src/test/queries/clientnegative/udf_in.q
+++ b/ql/src/test/queries/clientnegative/udf_in.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT 3 IN (array(1,2,3)) FROM src;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
index ac8253f..302a3ee 100644
--- a/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT instr('abcd') FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q b/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
index 9ac3ed6..b9f7807 100644
--- a/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
+++ b/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 FROM src_thrift
 SELECT instr('abcd', src_thrift.lintstring)
 WHERE src_thrift.lintstring IS NOT NULL;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_invalid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_invalid.q b/ql/src/test/queries/clientnegative/udf_invalid.q
index 68050fd..b10ac78 100644
--- a/ql/src/test/queries/clientnegative/udf_invalid.q
+++ b/ql/src/test/queries/clientnegative/udf_invalid.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select default.nonexistfunc() from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_likeall_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_likeall_wrong1.q b/ql/src/test/queries/clientnegative/udf_likeall_wrong1.q
index 2578ee2..055a4ec 100644
--- a/ql/src/test/queries/clientnegative/udf_likeall_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_likeall_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 SELECT 120 like all ('a%','%bc%','%c')
 FROM src WHERE src.key = 86;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_likeany_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_likeany_wrong1.q b/ql/src/test/queries/clientnegative/udf_likeany_wrong1.q
index fcc0905..50b161c 100644
--- a/ql/src/test/queries/clientnegative/udf_likeany_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_likeany_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 SELECT 120 like any ('a%','%bc%','%c')
 FROM src WHERE src.key = 86;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
index ca7caad..38492b9 100644
--- a/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT locate('a', 'b', 1, 2) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q b/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
index 4bbf79a..b59bd8a 100644
--- a/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
+++ b/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 FROM src_thrift
 SELECT locate('abcd', src_thrift.lintstring)
 WHERE src_thrift.lintstring IS NOT NULL;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q b/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
index ebb6c2a..be00af1 100644
--- a/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
+++ b/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT map_keys(map("a", "1"), map("b", "2")) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q b/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
index 0757d14..a3cafe7 100644
--- a/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
+++ b/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT map_keys(array(1, 2, 3)) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q b/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
index c97476a..e9c0ec5 100644
--- a/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
+++ b/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT map_values(map("a", "1"), map("b", "2")) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q b/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
index cc060ea..1e25f7e 100644
--- a/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
+++ b/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT map_values(array(1, 2, 3, 4)) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_max.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_max.q b/ql/src/test/queries/clientnegative/udf_max.q
index 7282e07..d7072fa 100644
--- a/ql/src/test/queries/clientnegative/udf_max.q
+++ b/ql/src/test/queries/clientnegative/udf_max.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 SELECT max(map("key", key, "value", value))
 FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_min.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_min.q b/ql/src/test/queries/clientnegative/udf_min.q
index b9528fa..6ce87ba 100644
--- a/ql/src/test/queries/clientnegative/udf_min.q
+++ b/ql/src/test/queries/clientnegative/udf_min.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 SELECT min(map("key", key, "value", value))
 FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_printf_wrong1.q b/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
index 88ca4fe..3a8ea12 100644
--- a/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument length
 SELECT printf() FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_printf_wrong2.q b/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
index 01ed2ff..a4836cd 100644
--- a/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT printf(100) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_printf_wrong3.q b/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
index 71f118b..bc51d20 100644
--- a/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
+++ b/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT printf("Hello World %s", array("invalid", "argument")) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_printf_wrong4.q b/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
index 71f118b..bc51d20 100644
--- a/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
+++ b/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT printf("Hello World %s", array("invalid", "argument")) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_reflect_neg.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_reflect_neg.q b/ql/src/test/queries/clientnegative/udf_reflect_neg.q
index 67efb64..fedc439 100644
--- a/ql/src/test/queries/clientnegative/udf_reflect_neg.q
+++ b/ql/src/test/queries/clientnegative/udf_reflect_neg.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT reflect("java.lang.StringClassThatDoesNotExist", "valueOf", 1),
        reflect("java.lang.String", "methodThatDoesNotExist"),
        reflect("java.lang.Math", "max", "overloadthatdoesnotexist", 3),

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q b/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
index c628ff8..69554ab 100644
--- a/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
+++ b/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 FROM src_thrift
 SELECT size(src_thrift.lint, src_thrift.lintstring), 
        size()

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_size_wrong_type.q b/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
index 16695f6..6eecb46 100644
--- a/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
+++ b/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT SIZE('wrong type: string') FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong1.q b/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong1.q
index 9101c7e..4ec26d0 100644
--- a/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type for first argument
 SELECT sort_array_by(array(2, 5, 4),'col1') FROM src LIMIT 1;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong2.q b/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong2.q
index 241d98e..6f3fd8b 100644
--- a/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_sort_array_by_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid numbers of arguments
 SELECT sort_array_by(array(struct(800 ,'Foo',28,80000) , struct(100,'Boo',21,70000))) FROM src LIMIT 1;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q b/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
index 9954f4a..8f9ffef 100644
--- a/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
+++ b/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument number
 SELECT sort_array(array(2, 5, 4), 3) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q b/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
index 32c2645..141403a 100644
--- a/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
+++ b/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT sort_array("Invalid") FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q b/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
index 49856ae..8ad8015 100644
--- a/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
+++ b/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
 -- invalid argument type
 SELECT sort_array(array(create_union(0,"a"))) FROM src LIMIT 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_test_error.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_test_error.q b/ql/src/test/queries/clientnegative/udf_test_error.q
index 846f87c..bd19fc5 100644
--- a/ql/src/test/queries/clientnegative/udf_test_error.q
+++ b/ql/src/test/queries/clientnegative/udf_test_error.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TEMPORARY FUNCTION test_error AS 'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse';
 
 SELECT test_error(key < 125 OR key > 130) FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_test_error_reduce.q b/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
index b1a06f2..e5c77cc 100644
--- a/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
+++ b/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TEMPORARY FUNCTION test_error AS 'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse';
 
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udf_when_type_wrong.q b/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
index d4d2d2e..f36ddd3 100644
--- a/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
+++ b/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT CASE
         WHEN TRUE THEN 2
         WHEN '1' THEN 4

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q b/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
index 942ae5d..678f5fd 100644
--- a/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
+++ b/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal) FROM src GROUP BY key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q b/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
index 00d359a..f085c9e 100644
--- a/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
+++ b/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal,myVal2) FROM src;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q b/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
index 51df8fa..4eed8c3 100644
--- a/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
+++ b/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select explode(array(1),array(2)) as myCol from src;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q b/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
index ae8dff7..9004d33 100644
--- a/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
+++ b/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT explode(null) as myNull FROM src GROUP BY key;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_invalid_place.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_invalid_place.q b/ql/src/test/queries/clientnegative/udtf_invalid_place.q
index ab84a80..69a4b6c 100644
--- a/ql/src/test/queries/clientnegative/udtf_invalid_place.q
+++ b/ql/src/test/queries/clientnegative/udtf_invalid_place.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select distinct key, explode(key) from src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_not_supported1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_not_supported1.q b/ql/src/test/queries/clientnegative/udtf_not_supported1.q
index 04e98d5..1fe4abe 100644
--- a/ql/src/test/queries/clientnegative/udtf_not_supported1.q
+++ b/ql/src/test/queries/clientnegative/udtf_not_supported1.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT explode(array(1,2,3)) as myCol, key FROM src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/udtf_not_supported3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/udtf_not_supported3.q b/ql/src/test/queries/clientnegative/udtf_not_supported3.q
index f4fe0dd..0cf1bd6 100644
--- a/ql/src/test/queries/clientnegative/udtf_not_supported3.q
+++ b/ql/src/test/queries/clientnegative/udtf_not_supported3.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 SELECT explode(array(1,2,3)) as myCol FROM src GROUP BY key;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/union22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/union22.q b/ql/src/test/queries/clientnegative/union22.q
index 0e43cd3..7d84423 100644
--- a/ql/src/test/queries/clientnegative/union22.q
+++ b/ql/src/test/queries/clientnegative/union22.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string);
 create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unionClusterBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unionClusterBy.q b/ql/src/test/queries/clientnegative/unionClusterBy.q
index f2bf837..e9bf95b 100644
--- a/ql/src/test/queries/clientnegative/unionClusterBy.q
+++ b/ql/src/test/queries/clientnegative/unionClusterBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- orderByClause clusterByClause distributeByClause sortByClause limitClause
 -- can only be applied to the whole union.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unionDistributeBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unionDistributeBy.q b/ql/src/test/queries/clientnegative/unionDistributeBy.q
index fe2a544..0b9b1c6 100644
--- a/ql/src/test/queries/clientnegative/unionDistributeBy.q
+++ b/ql/src/test/queries/clientnegative/unionDistributeBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- orderByClause clusterByClause distributeByClause sortByClause limitClause
 -- can only be applied to the whole union.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unionLimit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unionLimit.q b/ql/src/test/queries/clientnegative/unionLimit.q
index 91f2af5..55c2a98 100644
--- a/ql/src/test/queries/clientnegative/unionLimit.q
+++ b/ql/src/test/queries/clientnegative/unionLimit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- orderByClause clusterByClause distributeByClause sortByClause limitClause
 -- can only be applied to the whole union.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unionOrderBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unionOrderBy.q b/ql/src/test/queries/clientnegative/unionOrderBy.q
index 0477e2d..fdd5e9c 100644
--- a/ql/src/test/queries/clientnegative/unionOrderBy.q
+++ b/ql/src/test/queries/clientnegative/unionOrderBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- orderByClause clusterByClause distributeByClause sortByClause limitClause
 -- can only be applied to the whole union.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unionSortBy.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unionSortBy.q b/ql/src/test/queries/clientnegative/unionSortBy.q
index 8cf8b90..4cd5226 100644
--- a/ql/src/test/queries/clientnegative/unionSortBy.q
+++ b/ql/src/test/queries/clientnegative/unionSortBy.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- orderByClause clusterByClause distributeByClause sortByClause limitClause
 -- can only be applied to the whole union.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/uniquejoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/uniquejoin.q b/ql/src/test/queries/clientnegative/uniquejoin.q
index d6a19c3..3a69f93 100644
--- a/ql/src/test/queries/clientnegative/uniquejoin.q
+++ b/ql/src/test/queries/clientnegative/uniquejoin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 FROM UNIQUEJOIN (SELECT src.key from src WHERE src.key<4) a (a.key), PRESERVE  src b(b.key)
 SELECT a.key, b.key;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/uniquejoin2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/uniquejoin2.q b/ql/src/test/queries/clientnegative/uniquejoin2.q
index 6e9a082..f14f38e 100644
--- a/ql/src/test/queries/clientnegative/uniquejoin2.q
+++ b/ql/src/test/queries/clientnegative/uniquejoin2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 FROM UNIQUEJOIN src a (a.key), PRESERVE src b (b.key, b.val)
 SELECT a.key, b.key;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/uniquejoin3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/uniquejoin3.q b/ql/src/test/queries/clientnegative/uniquejoin3.q
index 89a8f1b..7673224 100644
--- a/ql/src/test/queries/clientnegative/uniquejoin3.q
+++ b/ql/src/test/queries/clientnegative/uniquejoin3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 FROM UNIQUEJOIN src a (a.key), PRESERVE src b (b.key) JOIN src c ON c.key
 SELECT a.key;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/unset_view_property.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/unset_view_property.q b/ql/src/test/queries/clientnegative/unset_view_property.q
index 1113100..19ad44c 100644
--- a/ql/src/test/queries/clientnegative/unset_view_property.q
+++ b/ql/src/test/queries/clientnegative/unset_view_property.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE VIEW testView AS SELECT value FROM src WHERE key=86;
 ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200');
 SHOW TBLPROPERTIES testView;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/updateBasicStats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/updateBasicStats.q b/ql/src/test/queries/clientnegative/updateBasicStats.q
index b9e642d..28be485 100644
--- a/ql/src/test/queries/clientnegative/updateBasicStats.q
+++ b/ql/src/test/queries/clientnegative/updateBasicStats.q
@@ -1,3 +1,4 @@
+--! 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/clientnegative/update_non_acid_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/update_non_acid_table.q b/ql/src/test/queries/clientnegative/update_non_acid_table.q
index f588f68..59f01f9 100644
--- a/ql/src/test/queries/clientnegative/update_non_acid_table.q
+++ b/ql/src/test/queries/clientnegative/update_non_acid_table.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q b/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
index c5b593e..e3a5a5a 100644
--- a/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
+++ b/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
@@ -1 +1,2 @@
+--! qt:dataset:src
 select nonexistfunc(key) over () from src limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q b/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
index 971f960..e401b53 100644
--- a/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
+++ b/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
@@ -1 +1,2 @@
+--! qt:dataset:part
 select sum(lead(p_retailprice,1)) as s1  from part;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q b/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
index 3aba793..7e2a374 100644
--- a/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
+++ b/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select p_mfgr, p_name, p_size,
 min(p_retailprice),
 rank() over(distribute by p_mfgr sort by p_name)as r,

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/windowing_ll_no_over.q b/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
index 6fc6df6..c6bd63e 100644
--- a/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
+++ b/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 select p_mfgr, 
 lead(p_retailprice,1) as s1  
 from part;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientnegative/wrong_column_type.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/wrong_column_type.q b/ql/src/test/queries/clientnegative/wrong_column_type.q
index 490f0c3..c1a937e 100644
--- a/ql/src/test/queries/clientnegative/wrong_column_type.q
+++ b/ql/src/test/queries/clientnegative/wrong_column_type.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE dest1(a float);
 
 INSERT OVERWRITE TABLE dest1

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/acid_globallimit.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_globallimit.q b/ql/src/test/queries/clientpositive/acid_globallimit.q
index 233b6b4..ed986c3 100644
--- a/ql/src/test/queries/clientpositive/acid_globallimit.q
+++ b/ql/src/test/queries/clientpositive/acid_globallimit.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.fetch.task.conversion=none;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/acid_no_buckets.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_no_buckets.q b/ql/src/test/queries/clientpositive/acid_no_buckets.q
index 189ad08..bcf9e06 100644
--- a/ql/src/test/queries/clientpositive/acid_no_buckets.q
+++ b/ql/src/test/queries/clientpositive/acid_no_buckets.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 --this has 4 groups of tests
 --Acid tables w/o bucketing
 --the tests with bucketing (make sure we get the same results)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/acid_nullscan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_nullscan.q b/ql/src/test/queries/clientpositive/acid_nullscan.q
index 3c71242..0d8ca2a 100644
--- a/ql/src/test/queries/clientpositive/acid_nullscan.q
+++ b/ql/src/test/queries/clientpositive/acid_nullscan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 
 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/acid_table_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/acid_table_stats.q b/ql/src/test/queries/clientpositive/acid_table_stats.q
index 9a3d97e..268028a 100644
--- a/ql/src/test/queries/clientpositive/acid_table_stats.q
+++ b/ql/src/test/queries/clientpositive/acid_table_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/add_jar_with_file_removed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/add_jar_with_file_removed.q b/ql/src/test/queries/clientpositive/add_jar_with_file_removed.q
index 95d7001..b45f712 100644
--- a/ql/src/test/queries/clientpositive/add_jar_with_file_removed.q
+++ b/ql/src/test/queries/clientpositive/add_jar_with_file_removed.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 !mkdir ${system:test.tmp.dir}/tmpjars;
 !touch ${system:test.tmp.dir}/tmpjars/added1.jar;
 !touch ${system:test.tmp.dir}/tmpjars/added2.jar;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/add_part_exist.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/add_part_exist.q b/ql/src/test/queries/clientpositive/add_part_exist.q
index b8ace72..a531bbc 100644
--- a/ql/src/test/queries/clientpositive/add_part_exist.q
+++ b/ql/src/test/queries/clientpositive/add_part_exist.q
@@ -14,7 +14,6 @@ ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITIO
 SHOW PARTITIONS add_part_test;
 
 DROP TABLE add_part_test;
-SHOW TABLES;
 
 -- Test ALTER TABLE ADD PARTITION in non-default Database
 CREATE DATABASE add_part_test_db;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/add_part_multiple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/add_part_multiple.q b/ql/src/test/queries/clientpositive/add_part_multiple.q
index 93ed787..9403368 100644
--- a/ql/src/test/queries/clientpositive/add_part_multiple.q
+++ b/ql/src/test/queries/clientpositive/add_part_multiple.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- HIVE-5122 locations for 2nd, 3rd... partition are ignored
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/add_partition_with_whitelist.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/add_partition_with_whitelist.q b/ql/src/test/queries/clientpositive/add_partition_with_whitelist.q
index 009c761..ab06484 100644
--- a/ql/src/test/queries/clientpositive/add_partition_with_whitelist.q
+++ b/ql/src/test/queries/clientpositive/add_partition_with_whitelist.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 SET hive.metastore.partition.name.whitelist.pattern=[A-Za-z]*;
 -- This pattern matches only letters.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alias_casted_column.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alias_casted_column.q b/ql/src/test/queries/clientpositive/alias_casted_column.q
index f1fc91a..c6a6a09 100644
--- a/ql/src/test/queries/clientpositive/alias_casted_column.q
+++ b/ql/src/test/queries/clientpositive/alias_casted_column.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- HIVE-2477 Use name of original expression for name of CAST output
 explain select key from (select cast(key as int) from src )t;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/allcolref_in_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/allcolref_in_udf.q b/ql/src/test/queries/clientpositive/allcolref_in_udf.q
index ecba251..c28d26e 100644
--- a/ql/src/test/queries/clientpositive/allcolref_in_udf.q
+++ b/ql/src/test/queries/clientpositive/allcolref_in_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 explain
 select concat(*),array(*) from src where key < 100 limit 10;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter1.q b/ql/src/test/queries/clientpositive/alter1.q
index 767ab5c..0843351 100644
--- a/ql/src/test/queries/clientpositive/alter1.q
+++ b/ql/src/test/queries/clientpositive/alter1.q
@@ -28,7 +28,7 @@ describe alter1;
 
 -- Cleanup
 DROP TABLE alter1;
-SHOW TABLES;
+SHOW TABLES LIKE "alter*";
 
 -- With non-default Database
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter2.q b/ql/src/test/queries/clientpositive/alter2.q
index ddf5787..6586afc 100644
--- a/ql/src/test/queries/clientpositive/alter2.q
+++ b/ql/src/test/queries/clientpositive/alter2.q
@@ -21,13 +21,13 @@ show partitions alter2;
 
 -- Cleanup
 DROP TABLE alter2;
-SHOW TABLES;
+SHOW TABLES LIKE "alter*";
 
 -- Using non-default Database
 
 CREATE DATABASE alter2_db;
 USE alter2_db;
-SHOW TABLES;
+SHOW TABLES LIKE "alter*";
 
 CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string);
 DESCRIBE EXTENDED alter2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter3.q b/ql/src/test/queries/clientpositive/alter3.q
index 91e4e9b..a38643d 100644
--- a/ql/src/test/queries/clientpositive/alter3.q
+++ b/ql/src/test/queries/clientpositive/alter3.q
@@ -25,7 +25,7 @@ describe extended alter3_like_renamed;
 DROP TABLE alter3_src;
 DROP TABLE alter3_renamed;
 DROP TABLE alter3_like_renamed;
-SHOW TABLES;
+SHOW TABLES LIKE "alter3_*";
 
 -- With non-default Database
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter4.q b/ql/src/test/queries/clientpositive/alter4.q
index 542ff01..7a87113 100644
--- a/ql/src/test/queries/clientpositive/alter4.q
+++ b/ql/src/test/queries/clientpositive/alter4.q
@@ -6,7 +6,7 @@ DESCRIBE EXTENDED set_bucketing_test;
 
 -- Cleanup
 DROP TABLE set_bucketing_test;
-SHOW TABLES;
+SHOW TABLES LIKE "set_bucketing_*";
 
 -- with non-default Database
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter5.q b/ql/src/test/queries/clientpositive/alter5.q
index 66c9f8d..62a73a4 100644
--- a/ql/src/test/queries/clientpositive/alter5.q
+++ b/ql/src/test/queries/clientpositive/alter5.q
@@ -23,7 +23,7 @@ describe extended alter5 partition (dt='a');
 -- Cleanup
 DROP TABLE alter5_src;
 DROP TABLE alter5;
-SHOW TABLES;
+SHOW TABLES LIKE "alter*";
 
 -- With non-default Database
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_char1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_char1.q b/ql/src/test/queries/clientpositive/alter_char1.q
index b604656..f828d39 100644
--- a/ql/src/test/queries/clientpositive/alter_char1.q
+++ b/ql/src/test/queries/clientpositive/alter_char1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 create database ac;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_char2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_char2.q b/ql/src/test/queries/clientpositive/alter_char2.q
index 24f9c58..44b352b 100644
--- a/ql/src/test/queries/clientpositive/alter_char2.q
+++ b/ql/src/test/queries/clientpositive/alter_char2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 -- alter column type, with partitioned table

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
index 10ba6e4..90257cf 100644
--- a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
+++ b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table src_orc_merge_test_part(key int, value string) partitioned by (ds string, ts string) stored as orc;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_merge_orc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge_orc.q b/ql/src/test/queries/clientpositive/alter_merge_orc.q
index aac98a8..f88b2a4 100644
--- a/ql/src/test/queries/clientpositive/alter_merge_orc.q
+++ b/ql/src/test/queries/clientpositive/alter_merge_orc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
 create table src_orc_merge_test(key int, value string) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_merge_stats_orc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_merge_stats_orc.q b/ql/src/test/queries/clientpositive/alter_merge_stats_orc.q
index 8d0c7bd..af02b58 100644
--- a/ql/src/test/queries/clientpositive/alter_merge_stats_orc.q
+++ b/ql/src/test/queries/clientpositive/alter_merge_stats_orc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.exec.submitviachild=false;
 set hive.exec.submit.local.task.via.child=false;
 create table src_orc_merge_test_stat(key int, value string) stored as orc;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table2_h23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table2_h23.q b/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table2_h23.q
index 15a88bb..1aa6401 100644
--- a/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table2_h23.q
+++ b/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table2_h23.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Tests that when overwriting a partition in a table after altering the bucketing/sorting metadata
 -- the partition metadata is updated as well.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table_h23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table_h23.q b/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table_h23.q
index 7d523d9..d214715 100644
--- a/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table_h23.q
+++ b/ql/src/test/queries/clientpositive/alter_numbuckets_partitioned_table_h23.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
 create table tst1(key string, value string) partitioned by (ds string) clustered by (key) into 10 buckets;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_partition_coltype.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_partition_coltype.q b/ql/src/test/queries/clientpositive/alter_partition_coltype.q
index c9a898b..b902a60 100644
--- a/ql/src/test/queries/clientpositive/alter_partition_coltype.q
+++ b/ql/src/test/queries/clientpositive/alter_partition_coltype.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 -- create testing table.
 create table alter_coltype(key string, value string) partitioned by (dt string, ts string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_partition_update_status.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_partition_update_status.q b/ql/src/test/queries/clientpositive/alter_partition_update_status.q
index f8bf2a2..434cff5 100644
--- a/ql/src/test/queries/clientpositive/alter_partition_update_status.q
+++ b/ql/src/test/queries/clientpositive/alter_partition_update_status.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 create table src_stat_part_one(key string, value string) partitioned by (partitionId int);
 
 insert overwrite table src_stat_part_one partition (partitionId=1)

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_partition_with_whitelist.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_partition_with_whitelist.q b/ql/src/test/queries/clientpositive/alter_partition_with_whitelist.q
index 301362a..3547503 100644
--- a/ql/src/test/queries/clientpositive/alter_partition_with_whitelist.q
+++ b/ql/src/test/queries/clientpositive/alter_partition_with_whitelist.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 SET hive.metastore.partition.name.whitelist.pattern=[A-Za-z]*;
 -- This pattern matches only letters.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_rename_partition.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_rename_partition.q b/ql/src/test/queries/clientpositive/alter_rename_partition.q
index 8ebbe9882..b6f6ccc 100644
--- a/ql/src/test/queries/clientpositive/alter_rename_partition.q
+++ b/ql/src/test/queries/clientpositive/alter_rename_partition.q
@@ -1,7 +1,6 @@
 -- Cleanup
 DROP TABLE alter_rename_partition_src;
 DROP TABLE alter_rename_partition;
-SHOW TABLES;
 
 create table alter_rename_partition_src ( col1 string ) stored as textfile ;
 load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src ;
@@ -19,7 +18,6 @@ select * from alter_rename_partition where pcol1='new_part1:' and pcol2='new_par
 -- Cleanup
 DROP TABLE alter_rename_partition_src;
 DROP TABLE alter_rename_partition;
-SHOW TABLES;
 
 -- With non-default Database
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q b/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
index 70f2bb4..5ffcaf0 100644
--- a/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
+++ b/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.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/alter_rename_table.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_rename_table.q b/ql/src/test/queries/clientpositive/alter_rename_table.q
index 2061850..53fb230 100644
--- a/ql/src/test/queries/clientpositive/alter_rename_table.q
+++ b/ql/src/test/queries/clientpositive/alter_rename_table.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create database source;
 create database target;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_table_column_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_column_stats.q b/ql/src/test/queries/clientpositive/alter_table_column_stats.q
index 8892d3f..9bb9ed7 100644
--- a/ql/src/test/queries/clientpositive/alter_table_column_stats.q
+++ b/ql/src/test/queries/clientpositive/alter_table_column_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
 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/alter_table_serde2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_serde2.q b/ql/src/test/queries/clientpositive/alter_table_serde2.q
index 6ca3be3..b7717f9 100644
--- a/ql/src/test/queries/clientpositive/alter_table_serde2.q
+++ b/ql/src/test/queries/clientpositive/alter_table_serde2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- Tests that when overwriting a partition in a table after altering the serde properties
 -- the partition metadata is updated as well.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_table_stats_status.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_stats_status.q b/ql/src/test/queries/clientpositive/alter_table_stats_status.q
index 8e07b81..9101f30 100644
--- a/ql/src/test/queries/clientpositive/alter_table_stats_status.q
+++ b/ql/src/test/queries/clientpositive/alter_table_stats_status.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 create database statsdb;
 use statsdb;
 create table srctable like default.src;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_table_update_status.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_update_status.q b/ql/src/test/queries/clientpositive/alter_table_update_status.q
index 9415c97..8882584 100644
--- a/ql/src/test/queries/clientpositive/alter_table_update_status.q
+++ b/ql/src/test/queries/clientpositive/alter_table_update_status.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 create table src_stat as select * from src1;
 
 create table src_stat_int (

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_table_update_status_disable_bitvector.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_table_update_status_disable_bitvector.q b/ql/src/test/queries/clientpositive/alter_table_update_status_disable_bitvector.q
index d64263f..f49c7a0 100644
--- a/ql/src/test/queries/clientpositive/alter_table_update_status_disable_bitvector.q
+++ b/ql/src/test/queries/clientpositive/alter_table_update_status_disable_bitvector.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.stats.fetch.bitvector=false;
 
 create table src_stat as select * from src1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_varchar1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_varchar1.q b/ql/src/test/queries/clientpositive/alter_varchar1.q
index 8ed3d20..4ca2954 100644
--- a/ql/src/test/queries/clientpositive/alter_varchar1.q
+++ b/ql/src/test/queries/clientpositive/alter_varchar1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 create database avc;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_varchar2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_varchar2.q b/ql/src/test/queries/clientpositive/alter_varchar2.q
index 558969a..ba70456 100644
--- a/ql/src/test/queries/clientpositive/alter_varchar2.q
+++ b/ql/src/test/queries/clientpositive/alter_varchar2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 
 -- alter column type, with partitioned table

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/alter_view_as_select.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/alter_view_as_select.q b/ql/src/test/queries/clientpositive/alter_view_as_select.q
index d2519a8..20c57b3 100644
--- a/ql/src/test/queries/clientpositive/alter_view_as_select.q
+++ b/ql/src/test/queries/clientpositive/alter_view_as_select.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 CREATE DATABASE tv;
 CREATE VIEW tv.testView as SELECT * FROM srcpart;
 DESCRIBE FORMATTED tv.testView;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ambiguitycheck.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ambiguitycheck.q b/ql/src/test/queries/clientpositive/ambiguitycheck.q
index 2334bc6..80b2fb4 100644
--- a/ql/src/test/queries/clientpositive/ambiguitycheck.q
+++ b/ql/src/test/queries/clientpositive/ambiguitycheck.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- check cluster/distribute/partitionBy
 SELECT * FROM SRC x where x.key = 20 CLUSTER BY (key,value) ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/ambiguous_col.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ambiguous_col.q b/ql/src/test/queries/clientpositive/ambiguous_col.q
index d1cebeb..0854718 100644
--- a/ql/src/test/queries/clientpositive/ambiguous_col.q
+++ b/ql/src/test/queries/clientpositive/ambiguous_col.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.support.quoted.identifiers=none;
 -- TOK_ALLCOLREF
 explain select * from (select a.key, a.* from (select * from src) a join (select * from src1) b on (a.key = b.key)) t;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/analyze_tbl_part.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/analyze_tbl_part.q b/ql/src/test/queries/clientpositive/analyze_tbl_part.q
index e8010bd..7198547 100644
--- a/ql/src/test/queries/clientpositive/analyze_tbl_part.q
+++ b/ql/src/test/queries/clientpositive/analyze_tbl_part.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.mapred.mode=nonstrict;
 create table src_stat_part(key string, value string) partitioned by (partitionId int);