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:54 UTC
[10/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/join16.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join16.q b/ql/src/test/queries/clientpositive/join16.q
index 901f9ca..91565c7 100644
--- a/ql/src/test/queries/clientpositive/join16.q
+++ b/ql/src/test/queries/clientpositive/join16.q
@@ -1,2 +1,3 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
EXPLAIN SELECT subq.key, tab.value FROM (select a.key, a.value from src a where a.key > 10 ) subq JOIN src tab ON (subq.key = tab.key and subq.key > 20 and subq.value = tab.value) where tab.value < 200;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join17.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join17.q b/ql/src/test/queries/clientpositive/join17.q
index 4a7eb99..a62b004 100644
--- a/ql/src/test/queries/clientpositive/join17.q
+++ b/ql/src/test/queries/clientpositive/join17.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join18.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join18.q b/ql/src/test/queries/clientpositive/join18.q
index 702735d..9ac2f2f 100644
--- a/ql/src/test/queries/clientpositive/join18.q
+++ b/ql/src/test/queries/clientpositive/join18.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join18_multi_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join18_multi_distinct.q b/ql/src/test/queries/clientpositive/join18_multi_distinct.q
index 8b3ac4d..cbdf27e 100644
--- a/ql/src/test/queries/clientpositive/join18_multi_distinct.q
+++ b/ql/src/test/queries/clientpositive/join18_multi_distinct.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join2.q b/ql/src/test/queries/clientpositive/join2.q
index c3c7c24..074255bb 100644
--- a/ql/src/test/queries/clientpositive/join2.q
+++ b/ql/src/test/queries/clientpositive/join2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- due to testMTQueries1
set hive.stats.column.autogather=false;
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join20.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join20.q b/ql/src/test/queries/clientpositive/join20.q
index b2b1eba..199c4b4 100644
--- a/ql/src/test/queries/clientpositive/join20.q
+++ b/ql/src/test/queries/clientpositive/join20.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join21.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join21.q b/ql/src/test/queries/clientpositive/join21.q
index 8ba2284..796fe80 100644
--- a/ql/src/test/queries/clientpositive/join21.q
+++ b/ql/src/test/queries/clientpositive/join21.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
EXPLAIN
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join22.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join22.q b/ql/src/test/queries/clientpositive/join22.q
index 525adfe..3a10cfc 100644
--- a/ql/src/test/queries/clientpositive/join22.q
+++ b/ql/src/test/queries/clientpositive/join22.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
explain
SELECT src5.src1_value FROM (SELECT src3.*, src4.value as src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = src2.key) src3 ON src3.src1_key = src4.key) src5;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join23.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join23.q b/ql/src/test/queries/clientpositive/join23.q
index d48941a..bb35103 100644
--- a/ql/src/test/queries/clientpositive/join23.q
+++ b/ql/src/test/queries/clientpositive/join23.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join24.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join24.q b/ql/src/test/queries/clientpositive/join24.q
index 65c9256..a0cd790 100644
--- a/ql/src/test/queries/clientpositive/join24.q
+++ b/ql/src/test/queries/clientpositive/join24.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table tst1(key STRING, cnt INT);
INSERT OVERWRITE TABLE tst1
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join25.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join25.q b/ql/src/test/queries/clientpositive/join25.q
index b8d7c22..18eecf5 100644
--- a/ql/src/test/queries/clientpositive/join25.q
+++ b/ql/src/test/queries/clientpositive/join25.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join26.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join26.q b/ql/src/test/queries/clientpositive/join26.q
index d34454d..bc1e7af 100644
--- a/ql/src/test/queries/clientpositive/join26.q
+++ b/ql/src/test/queries/clientpositive/join26.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join27.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join27.q b/ql/src/test/queries/clientpositive/join27.q
index d53f553..fb2d89c 100644
--- a/ql/src/test/queries/clientpositive/join27.q
+++ b/ql/src/test/queries/clientpositive/join27.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join28.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join28.q b/ql/src/test/queries/clientpositive/join28.q
index 2d96f97..456e21f 100644
--- a/ql/src/test/queries/clientpositive/join28.q
+++ b/ql/src/test/queries/clientpositive/join28.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join29.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join29.q b/ql/src/test/queries/clientpositive/join29.q
index 8b631e2..d86eb03 100644
--- a/ql/src/test/queries/clientpositive/join29.q
+++ b/ql/src/test/queries/clientpositive/join29.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join3.q b/ql/src/test/queries/clientpositive/join3.q
index af4c51b..da7cfa1 100644
--- a/ql/src/test/queries/clientpositive/join3.q
+++ b/ql/src/test/queries/clientpositive/join3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join30.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join30.q b/ql/src/test/queries/clientpositive/join30.q
index 004581f..ec2bae6 100644
--- a/ql/src/test/queries/clientpositive/join30.q
+++ b/ql/src/test/queries/clientpositive/join30.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key INT, cnt INT);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join31.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join31.q b/ql/src/test/queries/clientpositive/join31.q
index 62407a0..4fbf204 100644
--- a/ql/src/test/queries/clientpositive/join31.q
+++ b/ql/src/test/queries/clientpositive/join31.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.semijoin.conversion=true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join32.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32.q b/ql/src/test/queries/clientpositive/join32.q
index d89e3c5..9d3d645 100644
--- a/ql/src/test/queries/clientpositive/join32.q
+++ b/ql/src/test/queries/clientpositive/join32.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join32_lessSize.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join32_lessSize.q b/ql/src/test/queries/clientpositive/join32_lessSize.q
index cffdfc7..6114300 100644
--- a/ql/src/test/queries/clientpositive/join32_lessSize.q
+++ b/ql/src/test/queries/clientpositive/join32_lessSize.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join33.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join33.q b/ql/src/test/queries/clientpositive/join33.q
index d89e3c5..9d3d645 100644
--- a/ql/src/test/queries/clientpositive/join33.q
+++ b/ql/src/test/queries/clientpositive/join33.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join34.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join34.q b/ql/src/test/queries/clientpositive/join34.q
index 381464d..5077c19 100644
--- a/ql/src/test/queries/clientpositive/join34.q
+++ b/ql/src/test/queries/clientpositive/join34.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join35.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join35.q b/ql/src/test/queries/clientpositive/join35.q
index ed41b3e..be3703e 100644
--- a/ql/src/test/queries/clientpositive/join35.q
+++ b/ql/src/test/queries/clientpositive/join35.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join36.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join36.q b/ql/src/test/queries/clientpositive/join36.q
index 89fbb4c..20005dd 100644
--- a/ql/src/test/queries/clientpositive/join36.q
+++ b/ql/src/test/queries/clientpositive/join36.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE tmp1(key INT, cnt INT);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join37.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join37.q b/ql/src/test/queries/clientpositive/join37.q
index 92cae4d..3a19dd2 100644
--- a/ql/src/test/queries/clientpositive/join37.q
+++ b/ql/src/test/queries/clientpositive/join37.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key INT, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join38.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join38.q b/ql/src/test/queries/clientpositive/join38.q
index ed7b9d8..b9f723c 100644
--- a/ql/src/test/queries/clientpositive/join38.q
+++ b/ql/src/test/queries/clientpositive/join38.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table tmp(col0 string, col1 string,col2 string,col3 string,col4 string,col5 string,col6 string,col7 string,col8 string,col9 string,col10 string,col11 string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join39.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join39.q b/ql/src/test/queries/clientpositive/join39.q
index e14a114..b0358e9 100644
--- a/ql/src/test/queries/clientpositive/join39.q
+++ b/ql/src/test/queries/clientpositive/join39.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, key1 string, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join4.q b/ql/src/test/queries/clientpositive/join4.q
index 2ab9506..055ac3d 100644
--- a/ql/src/test/queries/clientpositive/join4.q
+++ b/ql/src/test/queries/clientpositive/join4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join40.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join40.q b/ql/src/test/queries/clientpositive/join40.q
index ee34983..4c983d8 100644
--- a/ql/src/test/queries/clientpositive/join40.q
+++ b/ql/src/test/queries/clientpositive/join40.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.join.cache.size=1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join41.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join41.q b/ql/src/test/queries/clientpositive/join41.q
index b3bea80..33dfcb0 100644
--- a/ql/src/test/queries/clientpositive/join41.q
+++ b/ql/src/test/queries/clientpositive/join41.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
create table s1 as select * from src where key = 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join44.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join44.q b/ql/src/test/queries/clientpositive/join44.q
index 0111079..69aa088 100644
--- a/ql/src/test/queries/clientpositive/join44.q
+++ b/ql/src/test/queries/clientpositive/join44.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src1
set hive.cbo.enable=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join45.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join45.q b/ql/src/test/queries/clientpositive/join45.q
index 54e422d..c0c7717 100644
--- a/ql/src/test/queries/clientpositive/join45.q
+++ b/ql/src/test/queries/clientpositive/join45.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:cbo_t1
set hive.strict.checks.cartesian.product=false;
-- Conjunction with pred on multiple inputs and single inputs
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join47.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join47.q b/ql/src/test/queries/clientpositive/join47.q
index 705c16a..b5345d8 100644
--- a/ql/src/test/queries/clientpositive/join47.q
+++ b/ql/src/test/queries/clientpositive/join47.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:cbo_t1
set hive.strict.checks.cartesian.product=false;
set hive.join.inner.residual=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join5.q b/ql/src/test/queries/clientpositive/join5.q
index f9154ba..0cb12d5 100644
--- a/ql/src/test/queries/clientpositive/join5.q
+++ b/ql/src/test/queries/clientpositive/join5.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join6.q b/ql/src/test/queries/clientpositive/join6.q
index 7542685..4fe1885 100644
--- a/ql/src/test/queries/clientpositive/join6.q
+++ b/ql/src/test/queries/clientpositive/join6.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join7.q b/ql/src/test/queries/clientpositive/join7.q
index d87789f..1047707 100644
--- a/ql/src/test/queries/clientpositive/join7.q
+++ b/ql/src/test/queries/clientpositive/join7.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING, c5 INT, c6 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join8.q b/ql/src/test/queries/clientpositive/join8.q
index 5c3ad60..292c07c 100644
--- a/ql/src/test/queries/clientpositive/join8.q
+++ b/ql/src/test/queries/clientpositive/join8.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join9.q b/ql/src/test/queries/clientpositive/join9.q
index c3d6178..0c17b04 100644
--- a/ql/src/test/queries/clientpositive/join9.q
+++ b/ql/src/test/queries/clientpositive/join9.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_alt_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_alt_syntax.q b/ql/src/test/queries/clientpositive/join_alt_syntax.q
index 7bf7943..4b0c93b 100644
--- a/ql/src/test/queries/clientpositive/join_alt_syntax.q
+++ b/ql/src/test/queries/clientpositive/join_alt_syntax.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select p1.p_name, p2.p_name
from part p1 , part p2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
index c59e02c..483be0c 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name and p2.p_name = p3.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
index 0fa29c7..e74f29e 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4 on p2.p_name = p3.p_name and p1.p_name = p4.p_name;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
index f959554..3c05554 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
index ee52342..9f7945e 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select *
from part p1 join part p2 join part p3 on p1.p_name = p2.p_name join part p4
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
index a8aade8..2be8dcc 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
index 0ab61d0..a5bb171 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
index fbcebe3..5f0c985 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
index 160c291..9bbecca 100644
--- a/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
+++ b/ql/src/test/queries/clientpositive/join_cond_pushdown_unqual4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
create table part2(
p2_partkey INT,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_empty.q b/ql/src/test/queries/clientpositive/join_empty.q
index 1409fa6..cab43df 100644
--- a/ql/src/test/queries/clientpositive/join_empty.q
+++ b/ql/src/test/queries/clientpositive/join_empty.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
create table srcpart_empty(key int, value string) partitioned by (ds string);
create table src2_empty (key int, value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_filters_overlap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_filters_overlap.q b/ql/src/test/queries/clientpositive/join_filters_overlap.q
index 277db70..a361024 100644
--- a/ql/src/test/queries/clientpositive/join_filters_overlap.q
+++ b/ql/src/test/queries/clientpositive/join_filters_overlap.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-- HIVE-3411 Filter predicates on outer join overlapped on single alias is not handled properly
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_literals.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_literals.q b/ql/src/test/queries/clientpositive/join_literals.q
index 3c79a12..a20e738 100644
--- a/ql/src/test/queries/clientpositive/join_literals.q
+++ b/ql/src/test/queries/clientpositive/join_literals.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- Test Joins with a variety of literals in the on clause
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_map_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_map_ppr.q b/ql/src/test/queries/clientpositive/join_map_ppr.q
index 840d303..4d0e559 100644
--- a/ql/src/test/queries/clientpositive/join_map_ppr.q
+++ b/ql/src/test/queries/clientpositive/join_map_ppr.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_max_hashtable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_max_hashtable.q b/ql/src/test/queries/clientpositive/join_max_hashtable.q
index 8d0ccb7..58cfa96 100644
--- a/ql/src/test/queries/clientpositive/join_max_hashtable.q
+++ b/ql/src/test/queries/clientpositive/join_max_hashtable.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.auto.convert.join=true;
set hive.optimize.dynamic.partition.hashjoin=true;
set hive.auto.convert.join.hashtable.max.entries=500;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
index 6ce88ea..3eee4f6 100644
--- a/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
+++ b/ql/src/test/queries/clientpositive/join_merge_multi_expressions.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.cbo.enable=true;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_merging.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_merging.q b/ql/src/test/queries/clientpositive/join_merging.q
index 4efb860..d27a106 100644
--- a/ql/src/test/queries/clientpositive/join_merging.q
+++ b/ql/src/test/queries/clientpositive/join_merging.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
explain select p1.p_size, p2.p_size
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_on_varchar.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_on_varchar.q b/ql/src/test/queries/clientpositive/join_on_varchar.q
index 5016369..d3c61f7 100644
--- a/ql/src/test/queries/clientpositive/join_on_varchar.q
+++ b/ql/src/test/queries/clientpositive/join_on_varchar.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/join_parse.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_parse.q b/ql/src/test/queries/clientpositive/join_parse.q
index 080933c..a99d542 100644
--- a/ql/src/test/queries/clientpositive/join_parse.q
+++ b/ql/src/test/queries/clientpositive/join_parse.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
explain
select srcpart.key, src1.value from
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_rc.q b/ql/src/test/queries/clientpositive/join_rc.q
index b02db62..e79f9ec 100644
--- a/ql/src/test/queries/clientpositive/join_rc.q
+++ b/ql/src/test/queries/clientpositive/join_rc.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/join_reorder.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_reorder.q b/ql/src/test/queries/clientpositive/join_reorder.q
index 5161f1b..9b87596 100644
--- a/ql/src/test/queries/clientpositive/join_reorder.q
+++ b/ql/src/test/queries/clientpositive/join_reorder.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/join_thrift.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_thrift.q b/ql/src/test/queries/clientpositive/join_thrift.q
index 87fc636..ed5c038 100644
--- a/ql/src/test/queries/clientpositive/join_thrift.q
+++ b/ql/src/test/queries/clientpositive/join_thrift.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src_thrift
-- SORT_QUERY_RESULTS
DESCRIBE src_thrift;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/join_vc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/join_vc.q b/ql/src/test/queries/clientpositive/join_vc.q
index 6d2d9c5..7bfb6fa 100644
--- a/ql/src/test/queries/clientpositive/join_vc.q
+++ b/ql/src/test/queries/clientpositive/join_vc.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted.
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/json_serde1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/json_serde1.q b/ql/src/test/queries/clientpositive/json_serde1.q
index 85f5af2..b805925 100644
--- a/ql/src/test/queries/clientpositive/json_serde1.q
+++ b/ql/src/test/queries/clientpositive/json_serde1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
add jar ${system:maven.local.repository}/org/apache/hive/hcatalog/hive-hcatalog-core/${system:hive.version}/hive-hcatalog-core-${system:hive.version}.jar;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/keyword_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/keyword_2.q b/ql/src/test/queries/clientpositive/keyword_2.q
index e8be760..7d3f205 100644
--- a/ql/src/test/queries/clientpositive/keyword_2.q
+++ b/ql/src/test/queries/clientpositive/keyword_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table varchar_udf_1;
create table varchar_udf_1 (c1 string, c2 string, c3 varchar(10), c4 varchar(20));
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/keyword_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/keyword_3.q b/ql/src/test/queries/clientpositive/keyword_3.q
index 098d0f9..93a0811 100644
--- a/ql/src/test/queries/clientpositive/keyword_3.q
+++ b/ql/src/test/queries/clientpositive/keyword_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table NULLS;
create table NULLS (LAST string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view.q b/ql/src/test/queries/clientpositive/lateral_view.q
index f0c094f..8454179 100644
--- a/ql/src/test/queries/clientpositive/lateral_view.q
+++ b/ql/src/test/queries/clientpositive/lateral_view.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_cp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_cp.q b/ql/src/test/queries/clientpositive/lateral_view_cp.q
index 5e0b6fa..f50bb84 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_cp.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_cp.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
--HIVE 3226
drop table array_valued_src;
create table array_valued_src (key string, value array<string>);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_explode2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_explode2.q b/ql/src/test/queries/clientpositive/lateral_view_explode2.q
index 1b5479a..edcfd9f 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_explode2.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_explode2.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 explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_noalias.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_noalias.q b/ql/src/test/queries/clientpositive/lateral_view_noalias.q
index df73432..ae80ee3 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_noalias.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_noalias.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.fetch.task.conversion=more;
--HIVE-2608 Do not require AS a,b,c part in LATERAL VIEW
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_onview.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_onview.q b/ql/src/test/queries/clientpositive/lateral_view_onview.q
index fa559f4..47134f1 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_onview.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_onview.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
CREATE TABLE lv_table( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1));
INSERT OVERWRITE TABLE lv_table SELECT 'abc ', array(1,2,3), 100, 't' FROM src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_onview2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_onview2.q b/ql/src/test/queries/clientpositive/lateral_view_onview2.q
index c13f754..2c4836e 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_onview2.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_onview2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
CREATE TABLE lv_table( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1));
INSERT OVERWRITE TABLE lv_table SELECT 'abc ', array(1,2,3), 100, 't' FROM src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_outer.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_outer.q b/ql/src/test/queries/clientpositive/lateral_view_outer.q
index d65e79d..ddb41a8 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_outer.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_outer.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- UDTF forwards nothing, OUTER LV add null for that
explain
select * from src LATERAL VIEW OUTER explode(array()) C AS a limit 10;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lateral_view_ppd.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lateral_view_ppd.q b/ql/src/test/queries/clientpositive/lateral_view_ppd.q
index 65ae518..6b76a7b 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_ppd.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_ppd.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
set hive.optimize.ppd=true;
EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol) a WHERE key='0';
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lb_fs_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lb_fs_stats.q b/ql/src/test/queries/clientpositive/lb_fs_stats.q
index 5ad3ff3..08baae7 100644
--- a/ql/src/test/queries/clientpositive/lb_fs_stats.q
+++ b/ql/src/test/queries/clientpositive/lb_fs_stats.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:part
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
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/leadlag.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/leadlag.q b/ql/src/test/queries/clientpositive/leadlag.q
index 7c85cf1..36ae3e0 100644
--- a/ql/src/test/queries/clientpositive/leadlag.q
+++ b/ql/src/test/queries/clientpositive/leadlag.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
--1. testLagWithPTFWindowing
select p_mfgr, p_name,
rank() over (partition by p_mfgr order by p_name) as r,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/leadlag_queries.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/leadlag_queries.q b/ql/src/test/queries/clientpositive/leadlag_queries.q
index 9b73685..50210fe 100644
--- a/ql/src/test/queries/clientpositive/leadlag_queries.q
+++ b/ql/src/test/queries/clientpositive/leadlag_queries.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
-- 1. testLeadUDAF
select p_mfgr, p_retailprice,
lead(p_retailprice) over (partition by p_mfgr order by p_name) as l1,
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/leftsemijoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/leftsemijoin.q b/ql/src/test/queries/clientpositive/leftsemijoin.q
index 8974219..c4717f6 100644
--- a/ql/src/test/queries/clientpositive/leftsemijoin.q
+++ b/ql/src/test/queries/clientpositive/leftsemijoin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:part
set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit0.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit0.q b/ql/src/test/queries/clientpositive/limit0.q
index 5d3fa9c..00597ca 100644
--- a/ql/src/test/queries/clientpositive/limit0.q
+++ b/ql/src/test/queries/clientpositive/limit0.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
explain select key from src limit 0;
explain select key from src where key = '238' limit 0;
explain select * from src where key = '238' limit 0;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit_join_transpose.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_join_transpose.q b/ql/src/test/queries/clientpositive/limit_join_transpose.q
index 087839d..09faf93 100644
--- a/ql/src/test/queries/clientpositive/limit_join_transpose.q
+++ b/ql/src/test/queries/clientpositive/limit_join_transpose.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.limittranspose=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit_pushdown.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown.q b/ql/src/test/queries/clientpositive/limit_pushdown.q
index a2aeaed..6888577 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.limit.pushdown.memory.usage=0.3f;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit_pushdown2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown2.q b/ql/src/test/queries/clientpositive/limit_pushdown2.q
index 1f00182..8971f32 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown2.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.limit.pushdown.memory.usage=0.3f;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit_pushdown3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown3.q b/ql/src/test/queries/clientpositive/limit_pushdown3.q
index efe559d..02a7942 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown3.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.limit.pushdown.memory.usage=0.3f;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
index 95c491c..48f0c2a 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.limit.pushdown.memory.usage=0.3f;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lineage1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage1.q b/ql/src/test/queries/clientpositive/lineage1.q
index b5b099b..3a03876 100644
--- a/ql/src/test/queries/clientpositive/lineage1.q
+++ b/ql/src/test/queries/clientpositive/lineage1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lineage2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage2.q b/ql/src/test/queries/clientpositive/lineage2.q
index 31694cb..298116f 100644
--- a/ql/src/test/queries/clientpositive/lineage2.q
+++ b/ql/src/test/queries/clientpositive/lineage2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lineage3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lineage3.q b/ql/src/test/queries/clientpositive/lineage3.q
index c907e21..50e9c84 100644
--- a/ql/src/test/queries/clientpositive/lineage3.q
+++ b/ql/src/test/queries/clientpositive/lineage3.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.LineageLogger;
set hive.metastore.disallow.incompatible.col.type.changes=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
index e38930f..7196d6a 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_10.q b/ql/src/test/queries/clientpositive/list_bucket_dml_10.q
index f25c174..60bad7f 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_10.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set mapred.input.dir.recursive=true;
-- run this test case in minimr to ensure it works in cluster
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
index 8ac1627..7ebf856 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
set hive.merge.mapfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
index 9facfa5..daaffbf 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
set hive.merge.mapfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
index 0fe7f61..091cf0c 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_13.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set mapred.input.dir.recursive=true;
set hive.merge.mapfiles=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_14.q b/ql/src/test/queries/clientpositive/list_bucket_dml_14.q
index abe5ea7..a0f9c2c 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_14.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_14.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
index c6dceab..948eabe 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
index ef01529..e66861e 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
index 950409d..c19ebe7 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
index fce8e2e..bd6a5cb 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
index 631c938..6cb29cb 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
index e2af1b3..2c96407 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
index 6d73896..f215852 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
index d2e24af..b9de430 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_dml_9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
index 1a4fbc2..9e377d5 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
index 996dce6..9af9132 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
index f09026f..b68ec64 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
index cc597dc..9032542 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
index fb4cf6d..1fa0638 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
index 702de64..7ff3d8d 100644
--- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
+++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.listbucketing=true;
set mapred.input.dir.recursive=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/literal_decimal.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/literal_decimal.q b/ql/src/test/queries/clientpositive/literal_decimal.q
index 1bafc24..5acae18 100644
--- a/ql/src/test/queries/clientpositive/literal_decimal.q
+++ b/ql/src/test/queries/clientpositive/literal_decimal.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.fetch.task.conversion=more;
EXPLAIN SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 99999999999999999BD, 99999999999999999.9999999999999BD, 1E99BD FROM src LIMIT 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/literal_double.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/literal_double.q b/ql/src/test/queries/clientpositive/literal_double.q
index 766da69..09f8cd3 100644
--- a/ql/src/test/queries/clientpositive/literal_double.q
+++ b/ql/src/test/queries/clientpositive/literal_double.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.fetch.task.conversion=more;
EXPLAIN SELECT 3.14, -3.14, 3.14e8, 3.14e-8, -3.14e8, -3.14e-8, 3.14e+8, 3.14E8, 3.14E-8 FROM src LIMIT 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/literal_ints.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/literal_ints.q b/ql/src/test/queries/clientpositive/literal_ints.q
index 5fd0cfa..1ffe2db 100644
--- a/ql/src/test/queries/clientpositive/literal_ints.q
+++ b/ql/src/test/queries/clientpositive/literal_ints.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.fetch.task.conversion=more;
EXPLAIN SELECT 100, 100Y, 100S, 100L FROM src LIMIT 1;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/literal_string.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/literal_string.q b/ql/src/test/queries/clientpositive/literal_string.q
index c57dc57..56cd160 100644
--- a/ql/src/test/queries/clientpositive/literal_string.q
+++ b/ql/src/test/queries/clientpositive/literal_string.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.fetch.task.conversion=more;
EXPLAIN SELECT 'face''book', 'face' 'book', 'face'
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_acid.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_acid.q b/ql/src/test/queries/clientpositive/llap_acid.q
index e0bde30..dfc7b04 100644
--- a/ql/src/test/queries/clientpositive/llap_acid.q
+++ b/ql/src/test/queries/clientpositive/llap_acid.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_acid2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_acid2.q b/ql/src/test/queries/clientpositive/llap_acid2.q
index 76f6203..108f00a 100644
--- a/ql/src/test/queries/clientpositive/llap_acid2.q
+++ b/ql/src/test/queries/clientpositive/llap_acid2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_acid_fast.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_acid_fast.q b/ql/src/test/queries/clientpositive/llap_acid_fast.q
index 89ca45f..1342efb 100644
--- a/ql/src/test/queries/clientpositive/llap_acid_fast.q
+++ b/ql/src/test/queries/clientpositive/llap_acid_fast.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_nullscan.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_nullscan.q b/ql/src/test/queries/clientpositive/llap_nullscan.q
index eeb3100..c123e9e 100644
--- a/ql/src/test/queries/clientpositive/llap_nullscan.q
+++ b/ql/src/test/queries/clientpositive/llap_nullscan.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.mapred.mode=nonstrict;
set hive.cbo.enable=false;
set hive.explain.user=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_partitioned.q b/ql/src/test/queries/clientpositive/llap_partitioned.q
index f3375b8..2ba38ce 100644
--- a/ql/src/test/queries/clientpositive/llap_partitioned.q
+++ b/ql/src/test/queries/clientpositive/llap_partitioned.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_smb.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_smb.q b/ql/src/test/queries/clientpositive/llap_smb.q
index b09901d..ac5faaa 100644
--- a/ql/src/test/queries/clientpositive/llap_smb.q
+++ b/ql/src/test/queries/clientpositive/llap_smb.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_stats.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_stats.q b/ql/src/test/queries/clientpositive/llap_stats.q
index 49b52bd..2f5369e 100644
--- a/ql/src/test/queries/clientpositive/llap_stats.q
+++ b/ql/src/test/queries/clientpositive/llap_stats.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
SET hive.vectorized.execution.enabled=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_text.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_text.q b/ql/src/test/queries/clientpositive/llap_text.q
index d0ad673..e4cf2ab 100644
--- a/ql/src/test/queries/clientpositive/llap_text.q
+++ b/ql/src/test/queries/clientpositive/llap_text.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_udf.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_udf.q b/ql/src/test/queries/clientpositive/llap_udf.q
index 8b1dcb7..65d930e 100644
--- a/ql/src/test/queries/clientpositive/llap_udf.q
+++ b/ql/src/test/queries/clientpositive/llap_udf.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.execution.mode=llap;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_uncompressed.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_uncompressed.q b/ql/src/test/queries/clientpositive/llap_uncompressed.q
index 34fd03f..0282457 100644
--- a/ql/src/test/queries/clientpositive/llap_uncompressed.q
+++ b/ql/src/test/queries/clientpositive/llap_uncompressed.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
SET hive.vectorized.execution.enabled=true;
SET hive.llap.io.enabled=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llap_vector_nohybridgrace.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llap_vector_nohybridgrace.q b/ql/src/test/queries/clientpositive/llap_vector_nohybridgrace.q
index 69f1819..d637d36 100644
--- a/ql/src/test/queries/clientpositive/llap_vector_nohybridgrace.q
+++ b/ql/src/test/queries/clientpositive/llap_vector_nohybridgrace.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.vectorized.execution.enabled=true;
set hive.vectorized.execution.mapjoin.native.enabled=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/llapdecider.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/llapdecider.q b/ql/src/test/queries/clientpositive/llapdecider.q
index 16b2521..86f4c6e 100644
--- a/ql/src/test/queries/clientpositive/llapdecider.q
+++ b/ql/src/test/queries/clientpositive/llapdecider.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.stats.fetch.column.stats=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part1.q b/ql/src/test/queries/clientpositive/load_dyn_part1.q
index 68323ab..bac1f1e 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part1.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part10.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part10.q b/ql/src/test/queries/clientpositive/load_dyn_part10.q
index 8bb3056..08929a1 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part10.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part10.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
-- SORT_QUERY_RESULTS
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part11.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part11.q b/ql/src/test/queries/clientpositive/load_dyn_part11.q
index 4cfbfe8..9e46d76 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part11.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part11.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part12.q b/ql/src/test/queries/clientpositive/load_dyn_part12.q
index dd8bd53..8e704ed 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part12.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part12.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part13.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part13.q b/ql/src/test/queries/clientpositive/load_dyn_part13.q
index 28b9aca..52d1b70 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part13.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part13.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part14.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part14.q b/ql/src/test/queries/clientpositive/load_dyn_part14.q
index eec0db8..13bcc6f 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part14.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part14.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
create table if not exists nzhang_part14 (key string)
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part15.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part15.q b/ql/src/test/queries/clientpositive/load_dyn_part15.q
index 3c33108..56eea14 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part15.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part15.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.exec.dynamic.partition=true;
set hive.exec.dynamic.partition.mode=nonstrict;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part2.q b/ql/src/test/queries/clientpositive/load_dyn_part2.q
index ba9e7a8..df72857 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part2.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part2.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part3.q b/ql/src/test/queries/clientpositive/load_dyn_part3.q
index 07423fd..bb2364d 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part3.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part4.q b/ql/src/test/queries/clientpositive/load_dyn_part4.q
index b46613d..550a152 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part4.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part4.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
-- SORT_QUERY_RESULTS
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part5.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part5.q b/ql/src/test/queries/clientpositive/load_dyn_part5.q
index 5780f5d..e845b4f 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part5.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part5.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table if not exists nzhang_part5 (key string) partitioned by (value string);
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part6.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part6.q b/ql/src/test/queries/clientpositive/load_dyn_part6.q
index b5e85ae..3c624d9 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part6.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part6.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part7.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part7.q b/ql/src/test/queries/clientpositive/load_dyn_part7.q
index b9e1da0..6e1131e 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part7.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part7.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part8.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part8.q b/ql/src/test/queries/clientpositive/load_dyn_part8.q
index 1806c84..4330e0c 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part8.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part8.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
-- SORT_QUERY_RESULTS
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_dyn_part9.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_dyn_part9.q b/ql/src/test/queries/clientpositive/load_dyn_part9.q
index 58eb66c..b8691a1 100644
--- a/ql/src/test/queries/clientpositive/load_dyn_part9.q
+++ b/ql/src/test/queries/clientpositive/load_dyn_part9.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
-- SORT_QUERY_RESULTS
show partitions srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/load_overwrite.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/load_overwrite.q b/ql/src/test/queries/clientpositive/load_overwrite.q
index 080c784..e9e6280 100644
--- a/ql/src/test/queries/clientpositive/load_overwrite.q
+++ b/ql/src/test/queries/clientpositive/load_overwrite.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
create table load_overwrite like src;
insert overwrite table load_overwrite select * from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/loadpart_err.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/loadpart_err.q b/ql/src/test/queries/clientpositive/loadpart_err.q
index 86d63d1..1204622 100644
--- a/ql/src/test/queries/clientpositive/loadpart_err.q
+++ b/ql/src/test/queries/clientpositive/loadpart_err.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.cli.errors.ignore=true;
ADD FILE ../../data/scripts/error_script;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lock1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lock1.q b/ql/src/test/queries/clientpositive/lock1.q
index 326cf49..a6b2c5b 100644
--- a/ql/src/test/queries/clientpositive/lock1.q
+++ b/ql/src/test/queries/clientpositive/lock1.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
drop table tstsrc;
create table tstsrc like src;
insert overwrite table tstsrc select key, value from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lock2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lock2.q b/ql/src/test/queries/clientpositive/lock2.q
index c8bff56..e990312 100644
--- a/ql/src/test/queries/clientpositive/lock2.q
+++ b/ql/src/test/queries/clientpositive/lock2.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
drop table tstsrc;
create table tstsrc like src;
insert overwrite table tstsrc select key, value from src;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lock3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lock3.q b/ql/src/test/queries/clientpositive/lock3.q
index 7f2178f..dd1843f 100644
--- a/ql/src/test/queries/clientpositive/lock3.q
+++ b/ql/src/test/queries/clientpositive/lock3.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
drop table tstsrcpart;
create table tstsrcpart like srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lock4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lock4.q b/ql/src/test/queries/clientpositive/lock4.q
index e07bfe8..f113659 100644
--- a/ql/src/test/queries/clientpositive/lock4.q
+++ b/ql/src/test/queries/clientpositive/lock4.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.lock.mapred.only.operation=true;
drop table tstsrcpart;
create table tstsrcpart like srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/louter_join_ppr.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/louter_join_ppr.q b/ql/src/test/queries/clientpositive/louter_join_ppr.q
index ef6f541..d8220d0 100644
--- a/ql/src/test/queries/clientpositive/louter_join_ppr.q
+++ b/ql/src/test/queries/clientpositive/louter_join_ppr.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.optimize.ppd=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/lvj_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/lvj_mapjoin.q b/ql/src/test/queries/clientpositive/lvj_mapjoin.q
index 5fb9a23..808d59a 100644
--- a/ql/src/test/queries/clientpositive/lvj_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/lvj_mapjoin.q
@@ -1,3 +1,4 @@
+--! qt:dataset:alltypesorc
set hive.explain.user=false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/macro.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/macro.q b/ql/src/test/queries/clientpositive/macro.q
index 47b05ff..7051126 100644
--- a/ql/src/test/queries/clientpositive/macro.q
+++ b/ql/src/test/queries/clientpositive/macro.q
@@ -1,3 +1,4 @@
+--! qt:dataset:src
set hive.fetch.task.conversion=more;
CREATE TEMPORARY MACRO SIGMOID (x DOUBLE) 1.0 / (1.0 + EXP(-x));
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin1.q b/ql/src/test/queries/clientpositive/mapjoin1.q
index 568557d..5e955f3 100644
--- a/ql/src/test/queries/clientpositive/mapjoin1.q
+++ b/ql/src/test/queries/clientpositive/mapjoin1.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src
set hive.auto.convert.join=true;
SELECT /*+ MAPJOIN(b) */ sum(a.key) as sum_a
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin47.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin47.q b/ql/src/test/queries/clientpositive/mapjoin47.q
index 9abd4f5..0b654cb 100644
--- a/ql/src/test/queries/clientpositive/mapjoin47.q
+++ b/ql/src/test/queries/clientpositive/mapjoin47.q
@@ -1,3 +1,6 @@
+--! qt:dataset:src1
+--! qt:dataset:src
+--! qt:dataset:cbo_t1
set hive.auto.convert.join=true;
set hive.strict.checks.cartesian.product=false;
set hive.join.emit.interval=2;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_distinct.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_distinct.q b/ql/src/test/queries/clientpositive/mapjoin_distinct.q
index 3afc9c6..1a0c309 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_distinct.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_distinct.q
@@ -1,3 +1,4 @@
+--! qt:dataset:srcpart
set hive.map.aggr = true;
set hive.auto.convert.join=true;
set hive.groupby.skewindata = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q b/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q
index bc98ca8..5d061da 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_filter_on_outerjoin.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.auto.convert.join = false;
-- SORT_QUERY_RESULTS
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_hint.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_hint.q b/ql/src/test/queries/clientpositive/mapjoin_hint.q
index fc85cc9..21b4896 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_hint.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_hint.q
@@ -1,3 +1,5 @@
+--! qt:dataset:srcpart
+--! qt:dataset:part
set hive.compute.query.using.stats=false;
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_hook.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_hook.q b/ql/src/test/queries/clientpositive/mapjoin_hook.q
index dd47d73..3dc479c 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_hook.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_hook.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.stats.column.autogather=false;
set hive.exec.post.hooks = org.apache.hadoop.hive.ql.hooks.MapJoinCounterHook,org.apache.hadoop.hive.ql.hooks.PrintCompletedTasksHook;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
index ddfa608..2b57e8a 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
set hive.auto.convert.join=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
index 9ca1fa2..11cf2cb 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_memcheck.q
@@ -1,3 +1,5 @@
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.auto.convert.join = true;
http://git-wip-us.apache.org/repos/asf/hive/blob/86b678f5/ql/src/test/queries/clientpositive/mapjoin_subquery.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mapjoin_subquery.q b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
index ebd584e..79fe197 100644
--- a/ql/src/test/queries/clientpositive/mapjoin_subquery.q
+++ b/ql/src/test/queries/clientpositive/mapjoin_subquery.q
@@ -1,3 +1,6 @@
+--! qt:dataset:srcpart
+--! qt:dataset:src1
+--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.auto.convert.join=true;
set hive.auto.convert.join.noconditionaltask=true;