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

[05/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/udf_character_length.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_character_length.q b/ql/src/test/queries/clientpositive/udf_character_length.q
index 1312334..fe0c1ba 100644
--- a/ql/src/test/queries/clientpositive/udf_character_length.q
+++ b/ql/src/test/queries/clientpositive/udf_character_length.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_classloader.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_classloader.q b/ql/src/test/queries/clientpositive/udf_classloader.q
index 82678c2..00ad858 100644
--- a/ql/src/test/queries/clientpositive/udf_classloader.q
+++ b/ql/src/test/queries/clientpositive/udf_classloader.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-udfs/udf-classloader-udf1/${system:hive.version}/udf-classloader-udf1-${system:hive.version}.jar;
 ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-udfs/udf-classloader-util/${system:hive.version}/udf-classloader-util-${system:hive.version}.jar;
 ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-udfs/udf-classloader-udf2/${system:hive.version}/udf-classloader-udf2-${system:hive.version}.jar;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_classloader_dynamic_dependency_resolution.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_classloader_dynamic_dependency_resolution.q b/ql/src/test/queries/clientpositive/udf_classloader_dynamic_dependency_resolution.q
index 2ceeaa3..19772fc 100644
--- a/ql/src/test/queries/clientpositive/udf_classloader_dynamic_dependency_resolution.q
+++ b/ql/src/test/queries/clientpositive/udf_classloader_dynamic_dependency_resolution.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 ADD JAR ivy://org.apache.hive.hive-it-custom-udfs:udf-classloader-udf1:+;
 ADD JAR ivy://org.apache.hive.hive-it-custom-udfs:udf-classloader-util:+;
 ADD JAR ivy://org.apache.hive.hive-it-custom-udfs:udf-classloader-udf2:+;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_coalesce.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_coalesce.q b/ql/src/test/queries/clientpositive/udf_coalesce.q
index d3c417b..7248efe 100644
--- a/ql/src/test/queries/clientpositive/udf_coalesce.q
+++ b/ql/src/test/queries/clientpositive/udf_coalesce.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src_thrift
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION coalesce;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_compare_java_string.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_compare_java_string.q b/ql/src/test/queries/clientpositive/udf_compare_java_string.q
index c7983b8..320296c 100644
--- a/ql/src/test/queries/clientpositive/udf_compare_java_string.q
+++ b/ql/src/test/queries/clientpositive/udf_compare_java_string.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_concat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_concat.q b/ql/src/test/queries/clientpositive/udf_concat.q
index e35a1cf..ea0a907 100644
--- a/ql/src/test/queries/clientpositive/udf_concat.q
+++ b/ql/src/test/queries/clientpositive/udf_concat.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION concat;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_concat_ws.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_concat_ws.q b/ql/src/test/queries/clientpositive/udf_concat_ws.q
index 538dfae..136ad58 100644
--- a/ql/src/test/queries/clientpositive/udf_concat_ws.q
+++ b/ql/src/test/queries/clientpositive/udf_concat_ws.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION concat_ws;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_context_aware.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_context_aware.q b/ql/src/test/queries/clientpositive/udf_context_aware.q
index bfbc73f..5bc735a 100644
--- a/ql/src/test/queries/clientpositive/udf_context_aware.q
+++ b/ql/src/test/queries/clientpositive/udf_context_aware.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SET hive.vectorized.execution.enabled=false;
 set hive.test.vectorized.execution.enabled.override=disable;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_conv.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_conv.q b/ql/src/test/queries/clientpositive/udf_conv.q
index c6d6cf8..ac77a5d 100644
--- a/ql/src/test/queries/clientpositive/udf_conv.q
+++ b/ql/src/test/queries/clientpositive/udf_conv.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION conv;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_cos.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_cos.q b/ql/src/test/queries/clientpositive/udf_cos.q
index 11ef8d7..e2935ef 100644
--- a/ql/src/test/queries/clientpositive/udf_cos.q
+++ b/ql/src/test/queries/clientpositive/udf_cos.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION cos;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_count.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_count.q b/ql/src/test/queries/clientpositive/udf_count.q
index 022d7a9..782d90e 100644
--- a/ql/src/test/queries/clientpositive/udf_count.q
+++ b/ql/src/test/queries/clientpositive/udf_count.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION count;
 DESCRIBE FUNCTION EXTENDED count;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_current_user.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_current_user.q b/ql/src/test/queries/clientpositive/udf_current_user.q
index f86ff10..4f97014 100644
--- a/ql/src/test/queries/clientpositive/udf_current_user.q
+++ b/ql/src/test/queries/clientpositive/udf_current_user.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION current_user;
 DESCRIBE FUNCTION EXTENDED current_user;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_degrees.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_degrees.q b/ql/src/test/queries/clientpositive/udf_degrees.q
index d5360fe..2de2ca6 100644
--- a/ql/src/test/queries/clientpositive/udf_degrees.q
+++ b/ql/src/test/queries/clientpositive/udf_degrees.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_div.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_div.q b/ql/src/test/queries/clientpositive/udf_div.q
index b0d2844..51ce500 100644
--- a/ql/src/test/queries/clientpositive/udf_div.q
+++ b/ql/src/test/queries/clientpositive/udf_div.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION div;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_divide.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_divide.q b/ql/src/test/queries/clientpositive/udf_divide.q
index d36ba99..ab9dab2 100644
--- a/ql/src/test/queries/clientpositive/udf_divide.q
+++ b/ql/src/test/queries/clientpositive/udf_divide.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION /;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_elt.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_elt.q b/ql/src/test/queries/clientpositive/udf_elt.q
index fae7649..681f2cf 100644
--- a/ql/src/test/queries/clientpositive/udf_elt.q
+++ b/ql/src/test/queries/clientpositive/udf_elt.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION elt;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_equal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_equal.q b/ql/src/test/queries/clientpositive/udf_equal.q
index ea9b18b..c9a846c 100644
--- a/ql/src/test/queries/clientpositive/udf_equal.q
+++ b/ql/src/test/queries/clientpositive/udf_equal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION =;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_example_add.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_example_add.q b/ql/src/test/queries/clientpositive/udf_example_add.q
index fb7b5c9..e099935 100644
--- a/ql/src/test/queries/clientpositive/udf_example_add.q
+++ b/ql/src/test/queries/clientpositive/udf_example_add.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
 
 CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd';

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_explode.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_explode.q b/ql/src/test/queries/clientpositive/udf_explode.q
index ae65164..ec3f6da 100644
--- a/ql/src/test/queries/clientpositive/udf_explode.q
+++ b/ql/src/test/queries/clientpositive/udf_explode.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION explode;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_field.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_field.q b/ql/src/test/queries/clientpositive/udf_field.q
index be92c02..82b335e 100644
--- a/ql/src/test/queries/clientpositive/udf_field.q
+++ b/ql/src/test/queries/clientpositive/udf_field.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION field;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_find_in_set.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_find_in_set.q b/ql/src/test/queries/clientpositive/udf_find_in_set.q
index 72c65b4..f002960 100644
--- a/ql/src/test/queries/clientpositive/udf_find_in_set.q
+++ b/ql/src/test/queries/clientpositive/udf_find_in_set.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION find_in_set;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_format_number.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_format_number.q b/ql/src/test/queries/clientpositive/udf_format_number.q
index 0d60c93..1f2bbb3 100644
--- a/ql/src/test/queries/clientpositive/udf_format_number.q
+++ b/ql/src/test/queries/clientpositive/udf_format_number.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 use default;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_get_json_object.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_get_json_object.q b/ql/src/test/queries/clientpositive/udf_get_json_object.q
index 50a573f..407ce50 100644
--- a/ql/src/test/queries/clientpositive/udf_get_json_object.q
+++ b/ql/src/test/queries/clientpositive/udf_get_json_object.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src_json
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION get_json_object;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_greaterthan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_greaterthan.q b/ql/src/test/queries/clientpositive/udf_greaterthan.q
index 230bd24..c0e5709 100644
--- a/ql/src/test/queries/clientpositive/udf_greaterthan.q
+++ b/ql/src/test/queries/clientpositive/udf_greaterthan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION >;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_greaterthanorequal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_greaterthanorequal.q b/ql/src/test/queries/clientpositive/udf_greaterthanorequal.q
index 025eed7..4df2756 100644
--- a/ql/src/test/queries/clientpositive/udf_greaterthanorequal.q
+++ b/ql/src/test/queries/clientpositive/udf_greaterthanorequal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION >=;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_greatest.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_greatest.q b/ql/src/test/queries/clientpositive/udf_greatest.q
index 03c01b5..2bac06d 100644
--- a/ql/src/test/queries/clientpositive/udf_greatest.q
+++ b/ql/src/test/queries/clientpositive/udf_greatest.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION greatest;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_hash.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_hash.q b/ql/src/test/queries/clientpositive/udf_hash.q
index 5814a17..b9bfbcd 100644
--- a/ql/src/test/queries/clientpositive/udf_hash.q
+++ b/ql/src/test/queries/clientpositive/udf_hash.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION hash;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_hex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_hex.q b/ql/src/test/queries/clientpositive/udf_hex.q
index 0e54579..9c4b5d4 100644
--- a/ql/src/test/queries/clientpositive/udf_hex.q
+++ b/ql/src/test/queries/clientpositive/udf_hex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION hex;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_hour.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_hour.q b/ql/src/test/queries/clientpositive/udf_hour.q
index 43d23c7..ee914f4 100644
--- a/ql/src/test/queries/clientpositive/udf_hour.q
+++ b/ql/src/test/queries/clientpositive/udf_hour.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_if.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_if.q b/ql/src/test/queries/clientpositive/udf_if.q
index d9285ff..2b85fe0 100644
--- a/ql/src/test/queries/clientpositive/udf_if.q
+++ b/ql/src/test/queries/clientpositive/udf_if.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION if;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_in.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_in.q b/ql/src/test/queries/clientpositive/udf_in.q
index f54d963..99fafd4 100644
--- a/ql/src/test/queries/clientpositive/udf_in.q
+++ b/ql/src/test/queries/clientpositive/udf_in.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 SELECT 1 IN (1, 2, 3),

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_inline.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_inline.q b/ql/src/test/queries/clientpositive/udf_inline.q
index 111e452..e24f8a7 100644
--- a/ql/src/test/queries/clientpositive/udf_inline.q
+++ b/ql/src/test/queries/clientpositive/udf_inline.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 SET hive.vectorized.execution.enabled=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_instr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_instr.q b/ql/src/test/queries/clientpositive/udf_instr.q
index 790a104..a7e837e 100644
--- a/ql/src/test/queries/clientpositive/udf_instr.q
+++ b/ql/src/test/queries/clientpositive/udf_instr.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION instr;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_isnull_isnotnull.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_isnull_isnotnull.q b/ql/src/test/queries/clientpositive/udf_isnull_isnotnull.q
index efb834e..9bcb608 100644
--- a/ql/src/test/queries/clientpositive/udf_isnull_isnotnull.q
+++ b/ql/src/test/queries/clientpositive/udf_isnull_isnotnull.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src_thrift
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION isnull;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_java_method.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_java_method.q b/ql/src/test/queries/clientpositive/udf_java_method.q
index 8ed2b44..4a66fd4 100644
--- a/ql/src/test/queries/clientpositive/udf_java_method.q
+++ b/ql/src/test/queries/clientpositive/udf_java_method.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION java_method;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_least.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_least.q b/ql/src/test/queries/clientpositive/udf_least.q
index 93d0ee8..5b79336 100644
--- a/ql/src/test/queries/clientpositive/udf_least.q
+++ b/ql/src/test/queries/clientpositive/udf_least.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION least;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_length.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_length.q b/ql/src/test/queries/clientpositive/udf_length.q
index 4413751..4d9dc02 100644
--- a/ql/src/test/queries/clientpositive/udf_length.q
+++ b/ql/src/test/queries/clientpositive/udf_length.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION length;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_lessthan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lessthan.q b/ql/src/test/queries/clientpositive/udf_lessthan.q
index 0332677..546834c 100644
--- a/ql/src/test/queries/clientpositive/udf_lessthan.q
+++ b/ql/src/test/queries/clientpositive/udf_lessthan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION <;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_lessthanorequal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lessthanorequal.q b/ql/src/test/queries/clientpositive/udf_lessthanorequal.q
index ae7109f..97166f1 100644
--- a/ql/src/test/queries/clientpositive/udf_lessthanorequal.q
+++ b/ql/src/test/queries/clientpositive/udf_lessthanorequal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION <=;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_likeall.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_likeall.q b/ql/src/test/queries/clientpositive/udf_likeall.q
index a580ae8..f8a3736 100644
--- a/ql/src/test/queries/clientpositive/udf_likeall.q
+++ b/ql/src/test/queries/clientpositive/udf_likeall.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT 'abc' like all ('a%','%bc%','%c')
 FROM src WHERE src.key = 86;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_likeany.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_likeany.q b/ql/src/test/queries/clientpositive/udf_likeany.q
index b3e6dc1..83d1288 100644
--- a/ql/src/test/queries/clientpositive/udf_likeany.q
+++ b/ql/src/test/queries/clientpositive/udf_likeany.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 SELECT 'abc' like any ('a%','%d','%cd%')
 FROM src WHERE src.key = 86;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_locate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_locate.q b/ql/src/test/queries/clientpositive/udf_locate.q
index 68216d5..c952071 100644
--- a/ql/src/test/queries/clientpositive/udf_locate.q
+++ b/ql/src/test/queries/clientpositive/udf_locate.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION locate;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_logged_in_user.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_logged_in_user.q b/ql/src/test/queries/clientpositive/udf_logged_in_user.q
index 4814c72..c9a6370 100644
--- a/ql/src/test/queries/clientpositive/udf_logged_in_user.q
+++ b/ql/src/test/queries/clientpositive/udf_logged_in_user.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION logged_in_user;
 DESCRIBE FUNCTION EXTENDED logged_in_user;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_logic_java_boolean.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_logic_java_boolean.q b/ql/src/test/queries/clientpositive/udf_logic_java_boolean.q
index a4aa6bc..125571d 100644
--- a/ql/src/test/queries/clientpositive/udf_logic_java_boolean.q
+++ b/ql/src/test/queries/clientpositive/udf_logic_java_boolean.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_lower.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lower.q b/ql/src/test/queries/clientpositive/udf_lower.q
index e30fa69..ba647e7 100644
--- a/ql/src/test/queries/clientpositive/udf_lower.q
+++ b/ql/src/test/queries/clientpositive/udf_lower.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION lower;
 DESCRIBE FUNCTION EXTENDED lower;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_lpad.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_lpad.q b/ql/src/test/queries/clientpositive/udf_lpad.q
index 937c92a..8dbe77e 100644
--- a/ql/src/test/queries/clientpositive/udf_lpad.q
+++ b/ql/src/test/queries/clientpositive/udf_lpad.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION lpad;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_map.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_map.q b/ql/src/test/queries/clientpositive/udf_map.q
index e1923b9..0f564de 100644
--- a/ql/src/test/queries/clientpositive/udf_map.q
+++ b/ql/src/test/queries/clientpositive/udf_map.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION map;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_map_keys.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_map_keys.q b/ql/src/test/queries/clientpositive/udf_map_keys.q
index 78778e7..1457d57 100644
--- a/ql/src/test/queries/clientpositive/udf_map_keys.q
+++ b/ql/src/test/queries/clientpositive/udf_map_keys.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 use default;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_map_values.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_map_values.q b/ql/src/test/queries/clientpositive/udf_map_values.q
index 4b55873..cd0b336 100644
--- a/ql/src/test/queries/clientpositive/udf_map_values.q
+++ b/ql/src/test/queries/clientpositive/udf_map_values.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 use default;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_max.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_max.q b/ql/src/test/queries/clientpositive/udf_max.q
index e5faae9..92782da 100644
--- a/ql/src/test/queries/clientpositive/udf_max.q
+++ b/ql/src/test/queries/clientpositive/udf_max.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION max;
 DESCRIBE FUNCTION EXTENDED max;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_min.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_min.q b/ql/src/test/queries/clientpositive/udf_min.q
index dd52208..347bd82 100644
--- a/ql/src/test/queries/clientpositive/udf_min.q
+++ b/ql/src/test/queries/clientpositive/udf_min.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION min;
 DESCRIBE FUNCTION EXTENDED min;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_minute.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_minute.q b/ql/src/test/queries/clientpositive/udf_minute.q
index c5d55ee..8c281e0 100644
--- a/ql/src/test/queries/clientpositive/udf_minute.q
+++ b/ql/src/test/queries/clientpositive/udf_minute.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION minute;
 DESCRIBE FUNCTION EXTENDED minute;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_modulo.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_modulo.q b/ql/src/test/queries/clientpositive/udf_modulo.q
index 28a9b10..ab52af0 100644
--- a/ql/src/test/queries/clientpositive/udf_modulo.q
+++ b/ql/src/test/queries/clientpositive/udf_modulo.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION mod;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_months_between.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_months_between.q b/ql/src/test/queries/clientpositive/udf_months_between.q
index dcc0fc6..8465e5e 100644
--- a/ql/src/test/queries/clientpositive/udf_months_between.q
+++ b/ql/src/test/queries/clientpositive/udf_months_between.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
 describe function months_between;
 desc function extended months_between;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_named_struct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_named_struct.q b/ql/src/test/queries/clientpositive/udf_named_struct.q
index ad6fd7a..193c62c 100644
--- a/ql/src/test/queries/clientpositive/udf_named_struct.q
+++ b/ql/src/test/queries/clientpositive/udf_named_struct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION named_struct;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_negative.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_negative.q b/ql/src/test/queries/clientpositive/udf_negative.q
index b038c8c..4a6aa02 100644
--- a/ql/src/test/queries/clientpositive/udf_negative.q
+++ b/ql/src/test/queries/clientpositive/udf_negative.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION negative;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_next_day.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_next_day.q b/ql/src/test/queries/clientpositive/udf_next_day.q
index 7f1c1e8..1034e49 100644
--- a/ql/src/test/queries/clientpositive/udf_next_day.q
+++ b/ql/src/test/queries/clientpositive/udf_next_day.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION next_day;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_notequal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_notequal.q b/ql/src/test/queries/clientpositive/udf_notequal.q
index 138110f..0d853ce 100644
--- a/ql/src/test/queries/clientpositive/udf_notequal.q
+++ b/ql/src/test/queries/clientpositive/udf_notequal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION <>;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_notop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_notop.q b/ql/src/test/queries/clientpositive/udf_notop.q
index 5cf918c..2a11dfb 100644
--- a/ql/src/test/queries/clientpositive/udf_notop.q
+++ b/ql/src/test/queries/clientpositive/udf_notop.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 SELECT 1 NOT IN (1, 2, 3),

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_nvl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_nvl.q b/ql/src/test/queries/clientpositive/udf_nvl.q
index 9716257..38a24bb 100644
--- a/ql/src/test/queries/clientpositive/udf_nvl.q
+++ b/ql/src/test/queries/clientpositive/udf_nvl.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION nvl;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_octet_length.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_octet_length.q b/ql/src/test/queries/clientpositive/udf_octet_length.q
index c221d93..62173b6 100644
--- a/ql/src/test/queries/clientpositive/udf_octet_length.q
+++ b/ql/src/test/queries/clientpositive/udf_octet_length.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 SET hive.vectorized.execution.enabled=false;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_parse_url.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_parse_url.q b/ql/src/test/queries/clientpositive/udf_parse_url.q
index e834fd7..3c55f9c 100644
--- a/ql/src/test/queries/clientpositive/udf_parse_url.q
+++ b/ql/src/test/queries/clientpositive/udf_parse_url.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 DESCRIBE FUNCTION parse_url;
 DESCRIBE FUNCTION EXTENDED parse_url;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_percentile.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_percentile.q b/ql/src/test/queries/clientpositive/udf_percentile.q
index 8852116..091e359 100644
--- a/ql/src/test/queries/clientpositive/udf_percentile.q
+++ b/ql/src/test/queries/clientpositive/udf_percentile.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION percentile;
 DESCRIBE FUNCTION EXTENDED percentile;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_pmod.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_pmod.q b/ql/src/test/queries/clientpositive/udf_pmod.q
index d42a2f3..854c9eb 100644
--- a/ql/src/test/queries/clientpositive/udf_pmod.q
+++ b/ql/src/test/queries/clientpositive/udf_pmod.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION pmod;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_printf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_printf.q b/ql/src/test/queries/clientpositive/udf_printf.q
index 115e4e5..eeaa3c6 100644
--- a/ql/src/test/queries/clientpositive/udf_printf.q
+++ b/ql/src/test/queries/clientpositive/udf_printf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 use default;
 -- Test printf() UDF
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_radians.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_radians.q b/ql/src/test/queries/clientpositive/udf_radians.q
index 19242bd..9532bb3 100644
--- a/ql/src/test/queries/clientpositive/udf_radians.q
+++ b/ql/src/test/queries/clientpositive/udf_radians.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_reflect.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_reflect.q b/ql/src/test/queries/clientpositive/udf_reflect.q
index 7fa9bf1..c7cdd7f 100644
--- a/ql/src/test/queries/clientpositive/udf_reflect.q
+++ b/ql/src/test/queries/clientpositive/udf_reflect.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION reflect;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_reflect2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_reflect2.q b/ql/src/test/queries/clientpositive/udf_reflect2.q
index 255dcdb..7ebe914 100644
--- a/ql/src/test/queries/clientpositive/udf_reflect2.q
+++ b/ql/src/test/queries/clientpositive/udf_reflect2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_regexp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_regexp.q b/ql/src/test/queries/clientpositive/udf_regexp.q
index 12b685b..1fac76a 100644
--- a/ql/src/test/queries/clientpositive/udf_regexp.q
+++ b/ql/src/test/queries/clientpositive/udf_regexp.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION regexp;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_repeat.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_repeat.q b/ql/src/test/queries/clientpositive/udf_repeat.q
index 91474ba..8b67dea 100644
--- a/ql/src/test/queries/clientpositive/udf_repeat.q
+++ b/ql/src/test/queries/clientpositive/udf_repeat.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION repeat;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_reverse.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_reverse.q b/ql/src/test/queries/clientpositive/udf_reverse.q
index 89aafe3..43ee1ed 100644
--- a/ql/src/test/queries/clientpositive/udf_reverse.q
+++ b/ql/src/test/queries/clientpositive/udf_reverse.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
 DESCRIBE FUNCTION reverse;
 DESCRIBE FUNCTION EXTENDED reverse;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_round.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_round.q b/ql/src/test/queries/clientpositive/udf_round.q
index 2441ff0..2f02bb5 100644
--- a/ql/src/test/queries/clientpositive/udf_round.q
+++ b/ql/src/test/queries/clientpositive/udf_round.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:lineitem
 set hive.fetch.task.conversion=more;
 DESCRIBE FUNCTION round;
 DESCRIBE FUNCTION EXTENDED round;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_round_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_round_2.q b/ql/src/test/queries/clientpositive/udf_round_2.q
index 38885a9..10f4561 100644
--- a/ql/src/test/queries/clientpositive/udf_round_2.q
+++ b/ql/src/test/queries/clientpositive/udf_round_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 set hive.stats.column.autogather=false;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_round_2_auto_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_round_2_auto_stats.q b/ql/src/test/queries/clientpositive/udf_round_2_auto_stats.q
index 2532f81..b2db151 100644
--- a/ql/src/test/queries/clientpositive/udf_round_2_auto_stats.q
+++ b/ql/src/test/queries/clientpositive/udf_round_2_auto_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 set hive.stats.column.autogather=true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_round_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_round_3.q b/ql/src/test/queries/clientpositive/udf_round_3.q
index f042b6f..c3194d4 100644
--- a/ql/src/test/queries/clientpositive/udf_round_3.q
+++ b/ql/src/test/queries/clientpositive/udf_round_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- test for TINYINT

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_rpad.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_rpad.q b/ql/src/test/queries/clientpositive/udf_rpad.q
index 4ee69e8..9b4e0e6 100644
--- a/ql/src/test/queries/clientpositive/udf_rpad.q
+++ b/ql/src/test/queries/clientpositive/udf_rpad.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION rpad;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_second.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_second.q b/ql/src/test/queries/clientpositive/udf_second.q
index 8cbc2f0..e926227 100644
--- a/ql/src/test/queries/clientpositive/udf_second.q
+++ b/ql/src/test/queries/clientpositive/udf_second.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_sentences.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sentences.q b/ql/src/test/queries/clientpositive/udf_sentences.q
index 97a3f18..2a1de55 100644
--- a/ql/src/test/queries/clientpositive/udf_sentences.q
+++ b/ql/src/test/queries/clientpositive/udf_sentences.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 CREATE TABLE sent_tmp (val array<string>);
 CREATE TABLE sent_tmp2 (val string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_sign.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sign.q b/ql/src/test/queries/clientpositive/udf_sign.q
index b1602e8..07e5c27 100644
--- a/ql/src/test/queries/clientpositive/udf_sign.q
+++ b/ql/src/test/queries/clientpositive/udf_sign.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_sin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sin.q b/ql/src/test/queries/clientpositive/udf_sin.q
index 79745be..7148cb7 100644
--- a/ql/src/test/queries/clientpositive/udf_sin.q
+++ b/ql/src/test/queries/clientpositive/udf_sin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION sin;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_size.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_size.q b/ql/src/test/queries/clientpositive/udf_size.q
index f6f76a3..58895ee 100644
--- a/ql/src/test/queries/clientpositive/udf_size.q
+++ b/ql/src/test/queries/clientpositive/udf_size.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION size;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_sort_array.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_sort_array.q b/ql/src/test/queries/clientpositive/udf_sort_array.q
index d53e2c8..7568fe3 100644
--- a/ql/src/test/queries/clientpositive/udf_sort_array.q
+++ b/ql/src/test/queries/clientpositive/udf_sort_array.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 use default;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_space.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_space.q b/ql/src/test/queries/clientpositive/udf_space.q
index cc616f7..28dd58d 100644
--- a/ql/src/test/queries/clientpositive/udf_space.q
+++ b/ql/src/test/queries/clientpositive/udf_space.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION space;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_split.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_split.q b/ql/src/test/queries/clientpositive/udf_split.q
index 55919ea..baec58c 100644
--- a/ql/src/test/queries/clientpositive/udf_split.q
+++ b/ql/src/test/queries/clientpositive/udf_split.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION split;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_struct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_struct.q b/ql/src/test/queries/clientpositive/udf_struct.q
index ee2135b..175627e 100644
--- a/ql/src/test/queries/clientpositive/udf_struct.q
+++ b/ql/src/test/queries/clientpositive/udf_struct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION struct;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_substr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_substr.q b/ql/src/test/queries/clientpositive/udf_substr.q
index 2d04f90..1784c27 100644
--- a/ql/src/test/queries/clientpositive/udf_substr.q
+++ b/ql/src/test/queries/clientpositive/udf_substr.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION substr;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_tan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_tan.q b/ql/src/test/queries/clientpositive/udf_tan.q
index 3980fe8..68f5b83 100644
--- a/ql/src/test/queries/clientpositive/udf_tan.q
+++ b/ql/src/test/queries/clientpositive/udf_tan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION tan;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_testlength.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_testlength.q b/ql/src/test/queries/clientpositive/udf_testlength.q
index c94a521..73f0ba7 100644
--- a/ql/src/test/queries/clientpositive/udf_testlength.q
+++ b/ql/src/test/queries/clientpositive/udf_testlength.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_testlength2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_testlength2.q b/ql/src/test/queries/clientpositive/udf_testlength2.q
index 27e46c2..87fd883 100644
--- a/ql/src/test/queries/clientpositive/udf_testlength2.q
+++ b/ql/src/test/queries/clientpositive/udf_testlength2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_boolean.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_boolean.q b/ql/src/test/queries/clientpositive/udf_to_boolean.q
index 1a50d05..b0ccd47 100644
--- a/ql/src/test/queries/clientpositive/udf_to_boolean.q
+++ b/ql/src/test/queries/clientpositive/udf_to_boolean.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- 'true' cases:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_byte.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_byte.q b/ql/src/test/queries/clientpositive/udf_to_byte.q
index aa0a250..77811bb 100644
--- a/ql/src/test/queries/clientpositive/udf_to_byte.q
+++ b/ql/src/test/queries/clientpositive/udf_to_byte.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to Byte type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_double.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_double.q b/ql/src/test/queries/clientpositive/udf_to_double.q
index 005ec9d..e8b18e4 100644
--- a/ql/src/test/queries/clientpositive/udf_to_double.q
+++ b/ql/src/test/queries/clientpositive/udf_to_double.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to Double type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_float.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_float.q b/ql/src/test/queries/clientpositive/udf_to_float.q
index 95671f1..b93b614 100644
--- a/ql/src/test/queries/clientpositive/udf_to_float.q
+++ b/ql/src/test/queries/clientpositive/udf_to_float.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to Float type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_long.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_long.q b/ql/src/test/queries/clientpositive/udf_to_long.q
index 706411a..1a72e53 100644
--- a/ql/src/test/queries/clientpositive/udf_to_long.q
+++ b/ql/src/test/queries/clientpositive/udf_to_long.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to Long type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_short.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_short.q b/ql/src/test/queries/clientpositive/udf_to_short.q
index 5cc4e57..e77da60 100644
--- a/ql/src/test/queries/clientpositive/udf_to_short.q
+++ b/ql/src/test/queries/clientpositive/udf_to_short.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to Short type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_string.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_string.q b/ql/src/test/queries/clientpositive/udf_to_string.q
index ac4b524..818f80f 100644
--- a/ql/src/test/queries/clientpositive/udf_to_string.q
+++ b/ql/src/test/queries/clientpositive/udf_to_string.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 -- Conversion of main primitive types to String type:

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_to_unix_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_to_unix_timestamp.q b/ql/src/test/queries/clientpositive/udf_to_unix_timestamp.q
index 0a2758e..78ecd56 100644
--- a/ql/src/test/queries/clientpositive/udf_to_unix_timestamp.q
+++ b/ql/src/test/queries/clientpositive/udf_to_unix_timestamp.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION to_unix_timestamp;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_translate.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_translate.q b/ql/src/test/queries/clientpositive/udf_translate.q
index 1f349aa..42da85c 100644
--- a/ql/src/test/queries/clientpositive/udf_translate.q
+++ b/ql/src/test/queries/clientpositive/udf_translate.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION translate;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_trunc_number.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_trunc_number.q b/ql/src/test/queries/clientpositive/udf_trunc_number.q
index b3fd9e5..9717968 100644
--- a/ql/src/test/queries/clientpositive/udf_trunc_number.q
+++ b/ql/src/test/queries/clientpositive/udf_trunc_number.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 EXPLAIN SELECT trunc(1234567891.1234567891,4), trunc(1234567891.1234567891,-4), trunc(1234567891.1234567891,0), trunc(1234567891.1234567891) FROM src tablesample (1 rows);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_unhex.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_unhex.q b/ql/src/test/queries/clientpositive/udf_unhex.q
index 257e469..3d49d73 100644
--- a/ql/src/test/queries/clientpositive/udf_unhex.q
+++ b/ql/src/test/queries/clientpositive/udf_unhex.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION unhex;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_union.q b/ql/src/test/queries/clientpositive/udf_union.q
index 3876beb..3cd034e 100644
--- a/ql/src/test/queries/clientpositive/udf_union.q
+++ b/ql/src/test/queries/clientpositive/udf_union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION create_union;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_using.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_using.q b/ql/src/test/queries/clientpositive/udf_using.q
index 093187d..d5e9206 100644
--- a/ql/src/test/queries/clientpositive/udf_using.q
+++ b/ql/src/test/queries/clientpositive/udf_using.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 dfs ${system:test.dfs.mkdir} hdfs:///tmp/udf_using;
 
 dfs -copyFromLocal ../../data/files/sales.txt hdfs:///tmp/udf_using/sales.txt;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_weekofyear.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_weekofyear.q b/ql/src/test/queries/clientpositive/udf_weekofyear.q
index abb0a2d..18ab828 100644
--- a/ql/src/test/queries/clientpositive/udf_weekofyear.q
+++ b/ql/src/test/queries/clientpositive/udf_weekofyear.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION weekofyear;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_when.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_when.q b/ql/src/test/queries/clientpositive/udf_when.q
index 4eb7f69..7873986 100644
--- a/ql/src/test/queries/clientpositive/udf_when.q
+++ b/ql/src/test/queries/clientpositive/udf_when.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION when;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath.q b/ql/src/test/queries/clientpositive/udf_xpath.q
index 1ad38ab..9fe9824 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_boolean.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_boolean.q b/ql/src/test/queries/clientpositive/udf_xpath_boolean.q
index 6e3ff24..73b0273 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_boolean.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_boolean.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_boolean ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_double.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_double.q b/ql/src/test/queries/clientpositive/udf_xpath_double.q
index 6844176..5b6d7b6 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_double.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_double.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_number ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_float.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_float.q b/ql/src/test/queries/clientpositive/udf_xpath_float.q
index 4596a32..c0a2af6 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_float.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_float.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_float ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_int.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_int.q b/ql/src/test/queries/clientpositive/udf_xpath_int.q
index 9f3898f..2e6d83e 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_int.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_int.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_int ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_long.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_long.q b/ql/src/test/queries/clientpositive/udf_xpath_long.q
index 3a33593..10cd946 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_long.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_long.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_long ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_short.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_short.q b/ql/src/test/queries/clientpositive/udf_xpath_short.q
index 073056e..2b194bf 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_short.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_short.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_short ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udf_xpath_string.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_xpath_string.q b/ql/src/test/queries/clientpositive/udf_xpath_string.q
index 1f1731c..294f107 100644
--- a/ql/src/test/queries/clientpositive/udf_xpath_string.q
+++ b/ql/src/test/queries/clientpositive/udf_xpath_string.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.fetch.task.conversion=more;
 
 DESCRIBE FUNCTION xpath_string ;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udtf_explode.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_explode.q b/ql/src/test/queries/clientpositive/udtf_explode.q
index cc69dbe..5661d6c 100644
--- a/ql/src/test/queries/clientpositive/udtf_explode.q
+++ b/ql/src/test/queries/clientpositive/udtf_explode.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.fetch.task.conversion=more;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udtf_json_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_json_tuple.q b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
index a46905c..f3b5549 100644
--- a/ql/src/test/queries/clientpositive/udtf_json_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_json_tuple.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table json_t (key string, jstring string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udtf_nofetchtask.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_nofetchtask.q b/ql/src/test/queries/clientpositive/udtf_nofetchtask.q
index f64b12f..b99e443 100644
--- a/ql/src/test/queries/clientpositive/udtf_nofetchtask.q
+++ b/ql/src/test/queries/clientpositive/udtf_nofetchtask.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create temporary function udtfCount2 as 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFCount2';
 
 set hive.fetch.task.conversion=minimal;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
index 69ee7be..5e672b9 100644
--- a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table url_t (key string, fullurl string);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/udtf_stack.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udtf_stack.q b/ql/src/test/queries/clientpositive/udtf_stack.q
index 1643ab5..ba2b6e3 100644
--- a/ql/src/test/queries/clientpositive/udtf_stack.q
+++ b/ql/src/test/queries/clientpositive/udtf_stack.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 DESCRIBE FUNCTION stack;
 
 EXPLAIN SELECT x, y FROM src LATERAL VIEW STACK(2, 'x', array(1), 'z') a AS x, y LIMIT 2;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union.q b/ql/src/test/queries/clientpositive/union.q
index 69e430f..3f40a25 100644
--- a/ql/src/test/queries/clientpositive/union.q
+++ b/ql/src/test/queries/clientpositive/union.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 -- union case: both subqueries are map jobs on same input, followed by filesink

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union12.q b/ql/src/test/queries/clientpositive/union12.q
index 418ec2d..dc00ed3 100644
--- a/ql/src/test/queries/clientpositive/union12.q
+++ b/ql/src/test/queries/clientpositive/union12.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcbucket
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union13.q b/ql/src/test/queries/clientpositive/union13.q
index e4fe2bf..6b8608e 100644
--- a/ql/src/test/queries/clientpositive/union13.q
+++ b/ql/src/test/queries/clientpositive/union13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 -- union case: both subqueries are a map-only jobs, same input, followed by filesink

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union14.q b/ql/src/test/queries/clientpositive/union14.q
index 01a352e..34f73cd 100644
--- a/ql/src/test/queries/clientpositive/union14.q
+++ b/ql/src/test/queries/clientpositive/union14.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union15.q b/ql/src/test/queries/clientpositive/union15.q
index 1dea476..d2590f8 100644
--- a/ql/src/test/queries/clientpositive/union15.q
+++ b/ql/src/test/queries/clientpositive/union15.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.map.aggr = true;
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union16.q b/ql/src/test/queries/clientpositive/union16.q
index bafcba9..6f5f29e 100644
--- a/ql/src/test/queries/clientpositive/union16.q
+++ b/ql/src/test/queries/clientpositive/union16.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_BEFORE_DIFF
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union17.q b/ql/src/test/queries/clientpositive/union17.q
index 2d31f6b..4c3a6c9 100644
--- a/ql/src/test/queries/clientpositive/union17.q
+++ b/ql/src/test/queries/clientpositive/union17.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union18.q b/ql/src/test/queries/clientpositive/union18.q
index 79827f4..1640b8a 100644
--- a/ql/src/test/queries/clientpositive/union18.q
+++ b/ql/src/test/queries/clientpositive/union18.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
 CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
 

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union20.q b/ql/src/test/queries/clientpositive/union20.q
index 66f94ad..26d4750 100644
--- a/ql/src/test/queries/clientpositive/union20.q
+++ b/ql/src/test/queries/clientpositive/union20.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 -- union :map-reduce sub-queries followed by join

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union21.q b/ql/src/test/queries/clientpositive/union21.q
index 284669d..9a6af34 100644
--- a/ql/src/test/queries/clientpositive/union21.q
+++ b/ql/src/test/queries/clientpositive/union21.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src_thrift
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 -- union of constants, udf outputs, and columns from text table and thrift table
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union22.q b/ql/src/test/queries/clientpositive/union22.q
index d6937f7..5d41351 100644
--- a/ql/src/test/queries/clientpositive/union22.q
+++ b/ql/src/test/queries/clientpositive/union22.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/union23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union23.q b/ql/src/test/queries/clientpositive/union23.q
index 052f34a..5d26175 100644
--- a/ql/src/test/queries/clientpositive/union23.q
+++ b/ql/src/test/queries/clientpositive/union23.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 explain
 select s.key2, s.value2

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union24.q b/ql/src/test/queries/clientpositive/union24.q
index 073ceeb..abe825c 100644
--- a/ql/src/test/queries/clientpositive/union24.q
+++ b/ql/src/test/queries/clientpositive/union24.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/union25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union25.q b/ql/src/test/queries/clientpositive/union25.q
index 5c5687c..d962af0 100644
--- a/ql/src/test/queries/clientpositive/union25.q
+++ b/ql/src/test/queries/clientpositive/union25.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 set hive.mapred.mode=nonstrict;
 create table tmp_srcpart like srcpart;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union26.q b/ql/src/test/queries/clientpositive/union26.q
index f0b3cbd..1a236d6 100644
--- a/ql/src/test/queries/clientpositive/union26.q
+++ b/ql/src/test/queries/clientpositive/union26.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
 -- SORT_QUERY_RESULTS
 
 EXPLAIN

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union27.q b/ql/src/test/queries/clientpositive/union27.q
index 19fab80..b0445c4 100644
--- a/ql/src/test/queries/clientpositive/union27.q
+++ b/ql/src/test/queries/clientpositive/union27.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 create table jackson_sev_same as select * from src;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union29.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union29.q b/ql/src/test/queries/clientpositive/union29.q
index ea99d4c..1cc29b9 100644
--- a/ql/src/test/queries/clientpositive/union29.q
+++ b/ql/src/test/queries/clientpositive/union29.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 create table union_subq_union(key int, value string);
 
 explain

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union3.q b/ql/src/test/queries/clientpositive/union3.q
index 35b298b..b4e0702 100644
--- a/ql/src/test/queries/clientpositive/union3.q
+++ b/ql/src/test/queries/clientpositive/union3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.explain.user=false;
 -- SORT_QUERY_RESULTS
 

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union30.q b/ql/src/test/queries/clientpositive/union30.q
index 0072dae..925d847 100644
--- a/ql/src/test/queries/clientpositive/union30.q
+++ b/ql/src/test/queries/clientpositive/union30.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 create table union_subq_union(key int, value string);
 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union32.q b/ql/src/test/queries/clientpositive/union32.q
index 4d9de6a..958529c 100644
--- a/ql/src/test/queries/clientpositive/union32.q
+++ b/ql/src/test/queries/clientpositive/union32.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/union33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union33.q b/ql/src/test/queries/clientpositive/union33.q
index 994060a..ad17e00 100644
--- a/ql/src/test/queries/clientpositive/union33.q
+++ b/ql/src/test/queries/clientpositive/union33.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.groupby.skewindata=true;
 -- SORT_BEFORE_DIFF

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union34.q b/ql/src/test/queries/clientpositive/union34.q
index dbefc40..492c941 100644
--- a/ql/src/test/queries/clientpositive/union34.q
+++ b/ql/src/test/queries/clientpositive/union34.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 -- SORT_QUERY_RESULTS
 create table src10_1 (key string, value string);

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union35.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union35.q b/ql/src/test/queries/clientpositive/union35.q
index c2a311e..38e9561 100644
--- a/ql/src/test/queries/clientpositive/union35.q
+++ b/ql/src/test/queries/clientpositive/union35.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 select * from (
      select * from ( select 1 as id , 'foo' as str_1 from src tablesample(5 rows)) f
  union all

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union6.q b/ql/src/test/queries/clientpositive/union6.q
index 9d18421..daaf21f 100644
--- a/ql/src/test/queries/clientpositive/union6.q
+++ b/ql/src/test/queries/clientpositive/union6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union7.q b/ql/src/test/queries/clientpositive/union7.q
index 9ecab8e..4d3eed5 100644
--- a/ql/src/test/queries/clientpositive/union7.q
+++ b/ql/src/test/queries/clientpositive/union7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;
 set hive.map.aggr = true;

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/unionDistinct_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unionDistinct_1.q b/ql/src/test/queries/clientpositive/unionDistinct_1.q
index 4978b56..16a3eea 100644
--- a/ql/src/test/queries/clientpositive/unionDistinct_1.q
+++ b/ql/src/test/queries/clientpositive/unionDistinct_1.q
@@ -1,3 +1,7 @@
+--! qt:dataset:srcpart
+--! qt:dataset:srcbucket
+--! qt:dataset:src1
+--! qt:dataset:src
 set hive.llap.execution.mode=auto;
 set hive.mapred.mode=nonstrict;
 set hive.explain.user=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/unionDistinct_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unionDistinct_2.q b/ql/src/test/queries/clientpositive/unionDistinct_2.q
index da47d38..374aaed 100644
--- a/ql/src/test/queries/clientpositive/unionDistinct_2.q
+++ b/ql/src/test/queries/clientpositive/unionDistinct_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 -- SORT_QUERY_RESULTS
 
 CREATE TABLE u1 as select key, value from src order by key limit 5;

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

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union_date_trim.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_date_trim.q b/ql/src/test/queries/clientpositive/union_date_trim.q
index 51f5997..3a27094 100644
--- a/ql/src/test/queries/clientpositive/union_date_trim.q
+++ b/ql/src/test/queries/clientpositive/union_date_trim.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
 drop table if exists testDate;
 create table testDate(id int, dt date);
 insert into table testDate select 1, '2014-04-07' from src where key=100 limit 1;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union_fast_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_fast_stats.q b/ql/src/test/queries/clientpositive/union_fast_stats.q
index 616af43..d69bef3 100644
--- a/ql/src/test/queries/clientpositive/union_fast_stats.q
+++ b/ql/src/test/queries/clientpositive/union_fast_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
 set hive.stats.dbclass=fs;
 set hive.merge.mapfiles=false;
 set hive.merge.mapredfiles=false;

http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/union_lateralview.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_lateralview.q b/ql/src/test/queries/clientpositive/union_lateralview.q
index 012296d..68b6f38 100644
--- a/ql/src/test/queries/clientpositive/union_lateralview.q
+++ b/ql/src/test/queries/clientpositive/union_lateralview.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
 
 create table test_union_lateral_view(key int, arr_ele int, value string);