http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
index eb99650..21dea74 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
@@ -1,6 +1,5 @@
 Warning: Shuffle Join MERGEJOIN[29][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- non agg, non corr
-explain
+PREHOOK: query: explain
 select * 
 from src 
 where src.key not in  
@@ -8,8 +7,7 @@ where src.key not in
     where s1.key > '2'
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- non agg, non corr
-explain
+POSTHOOK: query: explain
 select * 
 from src 
 where src.key not in  
@@ -299,8 +297,7 @@ POSTHOOK: Input: default@src
 199    val_199
 199    val_199
 2      val_2
-PREHOOK: query: -- non agg, corr
-explain
+PREHOOK: query: explain
 select p_mfgr, b.p_name, p_size 
 from part b 
 where b.p_name not in 
@@ -309,8 +306,7 @@ where b.p_name not in
   where r <= 2 and b.p_mfgr = a.p_mfgr 
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- non agg, corr
-explain
+POSTHOOK: query: explain
 select p_mfgr, b.p_name, p_size 
 from part b 
 where b.p_name not in 
@@ -745,8 +741,7 @@ Manufacturer#5      almond antique blue firebrick mint      
31
 Manufacturer#5 almond aquamarine dodger light gainsboro        46
 Manufacturer#5 almond azure blanched chiffon midnight  23
 Warning: Shuffle Join MERGEJOIN[49][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- agg, non corr
-explain
+PREHOOK: query: explain
 select p_name, p_size 
 from 
 part where part.p_size not in 
@@ -755,8 +750,7 @@ part where part.p_size not in
   where r <= 2
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- agg, non corr
-explain
+POSTHOOK: query: explain
 select p_name, p_size 
 from 
 part where part.p_size not in 
@@ -1057,8 +1051,7 @@ almond aquamarine sandy cyan gainsboro    18
 almond aquamarine yellow dodger mint   7
 almond azure aquamarine papaya violet  12
 almond azure blanched chiffon midnight 23
-PREHOOK: query: -- agg, corr
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size 
 from part b where b.p_size not in 
   (select min(p_size) 
@@ -1066,8 +1059,7 @@ from part b where b.p_size not in
   where r <= 2 and b.p_mfgr = a.p_mfgr
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- agg, corr
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size 
 from part b where b.p_size not in 
   (select min(p_size) 
@@ -1533,8 +1525,7 @@ Manufacturer#5    almond azure blanched chiffon midnight  
23
 Manufacturer#5 almond antique blue firebrick mint      31
 Manufacturer#5 almond aquamarine dodger light gainsboro        46
 Warning: Shuffle Join MERGEJOIN[35][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- non agg, non corr, Group By in Parent Query
-select li.l_partkey, count(*)
+PREHOOK: query: select li.l_partkey, count(*)
 from lineitem li
 where li.l_linenumber = 1 and
   li.l_orderkey not in (select l_orderkey from lineitem where l_shipmode = 
'AIR')
@@ -1542,8 +1533,7 @@ group by li.l_partkey
 PREHOOK: type: QUERY
 PREHOOK: Input: default@lineitem
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, non corr, Group By in Parent Query
-select li.l_partkey, count(*)
+POSTHOOK: query: select li.l_partkey, count(*)
 from lineitem li
 where li.l_linenumber = 1 and
   li.l_orderkey not in (select l_orderkey from lineitem where l_shipmode = 
'AIR')
@@ -1568,16 +1558,14 @@ POSTHOOK: Input: default@lineitem
 175839 1
 182052 1
 Warning: Shuffle Join MERGEJOIN[31][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- alternate not in syntax
-select * 
+PREHOOK: query: select * 
 from src 
 where not src.key in  ( select key from src s1 where s1.key > '2')
 order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- alternate not in syntax
-select * 
+POSTHOOK: query: select * 
 from src 
 where not src.key in  ( select key from src s1 where s1.key > '2')
 order by key
@@ -1703,15 +1691,13 @@ POSTHOOK: Input: default@src
 199    val_199
 199    val_199
 2      val_2
-PREHOOK: query: -- null check
-create view T1_v as 
+PREHOOK: query: create view T1_v as 
 select key from src where key <'11'
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T1_v
-POSTHOOK: query: -- null check
-create view T1_v as 
+POSTHOOK: query: create view T1_v as 
 select key from src where key <'11'
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@src
@@ -1916,11 +1902,9 @@ POSTHOOK: Input: default@src
 POSTHOOK: Input: default@t1_v
 POSTHOOK: Input: default@t2_v
 #### A masked pattern was here ####
-PREHOOK: query: --where has multiple conjuction
-explain select * from part where p_brand <> 'Brand#14' AND p_size NOT IN 
(select min(p_size) from part p where p.p_type = part.p_type group by p_type) 
AND p_size <> 340
+PREHOOK: query: explain select * from part where p_brand <> 'Brand#14' AND 
p_size NOT IN (select min(p_size) from part p where p.p_type = part.p_type 
group by p_type) AND p_size <> 340
 PREHOOK: type: QUERY
-POSTHOOK: query: --where has multiple conjuction
-explain select * from part where p_brand <> 'Brand#14' AND p_size NOT IN 
(select min(p_size) from part p where p.p_type = part.p_type group by p_type) 
AND p_size <> 340
+POSTHOOK: query: explain select * from part where p_brand <> 'Brand#14' AND 
p_size NOT IN (select min(p_size) from part p where p.p_type = part.p_type 
group by p_type) AND p_size <> 340
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2301,11 +2285,9 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 192697 almond antique blue firebrick mint      Manufacturer#5  Brand#52        
MEDIUM BURNISHED TIN    31      LG DRUM 1789.69 ickly ir
 Warning: Shuffle Join MERGEJOIN[36][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: --lhs contains non-simple expression
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type)
+PREHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type)
 PREHOOK: type: QUERY
-POSTHOOK: query: --lhs contains non-simple expression
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type)
+POSTHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2775,11 +2757,9 @@ POSTHOOK: Input: default@part
 192697 almond antique blue firebrick mint      Manufacturer#5  Brand#52        
MEDIUM BURNISHED TIN    31      LG DRUM 1789.69 ickly ir
 144293 almond antique olive coral navajo       Manufacturer#3  Brand#34        
STANDARD POLISHED STEEL 45      JUMBO CAN       1337.29 ag furiously about 
 191709 almond antique violet turquoise frosted Manufacturer#2  Brand#22        
ECONOMY POLISHED STEEL  40      MED BOX 1800.7   haggle
-PREHOOK: query: --lhs contains non-simple expression, corr
-explain select count(*) as c from part as e where p_size + 100 NOT IN (select 
p_partkey from part where p_name = e.p_name)
+PREHOOK: query: explain select count(*) as c from part as e where p_size + 100 
NOT IN (select p_partkey from part where p_name = e.p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: --lhs contains non-simple expression, corr
-explain select count(*) as c from part as e where p_size + 100 NOT IN (select 
p_partkey from part where p_name = e.p_name)
+POSTHOOK: query: explain select count(*) as c from part as e where p_size + 
100 NOT IN (select p_partkey from part where p_name = e.p_name)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -3117,11 +3097,9 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 26
 Warning: Shuffle Join MERGEJOIN[35][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- lhs contains udf expression
-explain select * from part  where floor(p_retailprice) NOT IN (select 
floor(min(p_retailprice)) from part group by p_type)
+PREHOOK: query: explain select * from part  where floor(p_retailprice) NOT IN 
(select floor(min(p_retailprice)) from part group by p_type)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- lhs contains udf expression
-explain select * from part  where floor(p_retailprice) NOT IN (select 
floor(min(p_retailprice)) from part group by p_type)
+POSTHOOK: query: explain select * from part  where floor(p_retailprice) NOT IN 
(select floor(min(p_retailprice)) from part group by p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -3680,11 +3658,9 @@ POSTHOOK: Input: default@part
 17927  almond aquamarine yellow dodger mint    Manufacturer#4  Brand#41        
ECONOMY BRUSHED COPPER  7       SM PKG  1844.92 ites. eve
 33357  almond azure aquamarine papaya violet   Manufacturer#4  Brand#41        
STANDARD ANODIZED TIN   12      WRAP CASE       1290.35 reful
 78486  almond azure blanched chiffon midnight  Manufacturer#5  Brand#52        
LARGE BRUSHED BRASS     23      MED BAG 1464.48 hely blith
-PREHOOK: query: -- correlated query, multiple correlated variables referring 
to different outer var
-explain select * from part where p_name NOT IN (select p_name from part p 
where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
+PREHOOK: query: explain select * from part where p_name NOT IN (select p_name 
from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- correlated query, multiple correlated variables referring 
to different outer var
-explain select * from part where p_name NOT IN (select p_name from part p 
where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
+POSTHOOK: query: explain select * from part where p_name NOT IN (select p_name 
from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4003,11 +3979,9 @@ POSTHOOK: query: select * from part where p_name NOT IN 
(select p_name from part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-PREHOOK: query: -- correlated var refers to outer table alias
-explain select p_name from (select p_name, p_type, p_brand as brand from part) 
fpart where fpart.p_type NOT IN (select p_type from part where part.p_brand = 
fpart.brand)
+PREHOOK: query: explain select p_name from (select p_name, p_type, p_brand as 
brand from part) fpart where fpart.p_type NOT IN (select p_type from part where 
part.p_brand = fpart.brand)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- correlated var refers to outer table alias
-explain select p_name from (select p_name, p_type, p_brand as brand from part) 
fpart where fpart.p_type NOT IN (select p_type from part where part.p_brand = 
fpart.brand)
+POSTHOOK: query: explain select p_name from (select p_name, p_type, p_brand as 
brand from part) fpart where fpart.p_type NOT IN (select p_type from part where 
part.p_brand = fpart.brand)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4326,11 +4300,9 @@ POSTHOOK: query: select p_name from (select p_name, 
p_type, p_brand as brand fro
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-PREHOOK: query: -- correlated var refers to outer table alias which is an 
expression 
-explain select p_name from (select p_name, p_type, p_size+1 as size from part) 
fpart where fpart.p_type NOT IN (select p_type from part where (part.p_size+1) 
= fpart.size)
+PREHOOK: query: explain select p_name from (select p_name, p_type, p_size+1 as 
size from part) fpart where fpart.p_type NOT IN (select p_type from part where 
(part.p_size+1) = fpart.size)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- correlated var refers to outer table alias which is an 
expression 
-explain select p_name from (select p_name, p_type, p_size+1 as size from part) 
fpart where fpart.p_type NOT IN (select p_type from part where (part.p_size+1) 
= fpart.size)
+POSTHOOK: query: explain select p_name from (select p_name, p_type, p_size+1 
as size from part) fpart where fpart.p_type NOT IN (select p_type from part 
where (part.p_size+1) = fpart.size)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4658,11 +4630,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[55][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- where plus having
-explain select key, count(*) from src where value NOT IN (select value from 
src) group by key having count(*) in (select count(*) from src s1 where s1.key 
= '90' group by s1.key )
+PREHOOK: query: explain select key, count(*) from src where value NOT IN 
(select value from src) group by key having count(*) in (select count(*) from 
src s1 where s1.key = '90' group by s1.key )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- where plus having
-explain select key, count(*) from src where value NOT IN (select value from 
src) group by key having count(*) in (select count(*) from src s1 where s1.key 
= '90' group by s1.key )
+POSTHOOK: query: explain select key, count(*) from src where value NOT IN 
(select value from src) group by key having count(*) in (select count(*) from 
src s1 where s1.key = '90' group by s1.key )
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4921,11 +4891,9 @@ POSTHOOK: query: select key, count(*) from src where 
value NOT IN (select value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-PREHOOK: query: -- where with having, correlated
-explain select key, count(*) from src where value NOT IN (select value from 
src sc where sc.key = src.key ) group by key having count(*) in (select 
count(*) from src s1 where s1.key = '90' group by s1.key )
+PREHOOK: query: explain select key, count(*) from src where value NOT IN 
(select value from src sc where sc.key = src.key ) group by key having count(*) 
in (select count(*) from src s1 where s1.key = '90' group by s1.key )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- where with having, correlated
-explain select key, count(*) from src where value NOT IN (select value from 
src sc where sc.key = src.key ) group by key having count(*) in (select 
count(*) from src s1 where s1.key = '90' group by s1.key )
+POSTHOOK: query: explain select key, count(*) from src where value NOT IN 
(select value from src sc where sc.key = src.key ) group by key having count(*) 
in (select count(*) from src s1 where s1.key = '90' group by s1.key )
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -5353,11 +5321,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- subquery with order by
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type) order by p_brand
+PREHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type) order by p_brand
 PREHOOK: type: QUERY
-POSTHOOK: query: -- subquery with order by
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type) order by p_brand
+POSTHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type) order by p_brand
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -5600,11 +5566,9 @@ POSTHOOK: Input: default@part
 192697 almond antique blue firebrick mint      Manufacturer#5  Brand#52        
MEDIUM BURNISHED TIN    31      LG DRUM 1789.69 ickly ir
 78486  almond azure blanched chiffon midnight  Manufacturer#5  Brand#52        
LARGE BRUSHED BRASS     23      MED BAG 1464.48 hely blith
 Warning: Shuffle Join MERGEJOIN[39][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: --order by with limit
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type) order by p_brand limit 4
+PREHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type) order by p_brand limit 4
 PREHOOK: type: QUERY
-POSTHOOK: query: --order by with limit
-explain select * from part  where (p_size-1) NOT IN (select min(p_size) from 
part group by p_type) order by p_brand limit 4
+POSTHOOK: query: explain select * from part  where (p_size-1) NOT IN (select 
min(p_size) from part group by p_type) order by p_brand limit 4
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -5839,11 +5803,9 @@ POSTHOOK: Input: default@part
 110592 almond antique salmon chartreuse burlywood      Manufacturer#1  
Brand#15        PROMO BURNISHED NICKEL  6       JUMBO PKG       1602.59  to the 
furiously
 105685 almond antique violet chocolate turquoise       Manufacturer#2  
Brand#22        MEDIUM ANODIZED COPPER  14      MED CAN 1690.68 ly pending requ
 Warning: Shuffle Join MERGEJOIN[37][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- union, uncorr
-explain select * from src where key NOT IN (select p_name from part UNION ALL 
select p_brand from part)
+PREHOOK: query: explain select * from src where key NOT IN (select p_name from 
part UNION ALL select p_brand from part)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union, uncorr
-explain select * from src where key NOT IN (select p_name from part UNION ALL 
select p_brand from part)
+POSTHOOK: query: explain select * from src where key NOT IN (select p_name 
from part UNION ALL select p_brand from part)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -6890,13 +6852,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 26
-PREHOOK: query: --nullability tests
-CREATE TABLE t1 (c1 INT, c2 CHAR(100))
+PREHOOK: query: CREATE TABLE t1 (c1 INT, c2 CHAR(100))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: --nullability tests
-CREATE TABLE t1 (c1 INT, c2 CHAR(100))
+POSTHOOK: query: CREATE TABLE t1 (c1 INT, c2 CHAR(100))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1
@@ -6924,11 +6884,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Output: default@t2
 POSTHOOK: Lineage: t2.c1 EXPRESSION 
[(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- uncorr
-explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2)
+PREHOOK: query: explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- uncorr
-explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2)
+POSTHOOK: query: explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -7087,11 +7045,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 #### A masked pattern was here ####
-PREHOOK: query: -- corr
-explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2 where t1.c2=t2.c1)
+PREHOOK: query: explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2 
where t1.c2=t2.c1)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- corr
-explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2 where t1.c2=t2.c1)
+POSTHOOK: query: explain SELECT c1 FROM t1 WHERE c1 NOT IN (SELECT c1 FROM t2 
where t1.c2=t2.c1)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -7428,13 +7384,11 @@ POSTHOOK: query: DROP TABLE t2
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@t2
 POSTHOOK: Output: default@t2
-PREHOOK: query: -- corr, nullability, should not produce any result
-create table t1(a int, b int)
+PREHOOK: query: create table t1(a int, b int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: -- corr, nullability, should not produce any result
-create table t1(a int, b int)
+POSTHOOK: query: create table t1(a int, b int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1
@@ -7801,13 +7755,11 @@ POSTHOOK: query: drop table t2
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@t2
 POSTHOOK: Output: default@t2
-PREHOOK: query: -- coor, nullability, should produce result
-create table t7(i int, j int)
+PREHOOK: query: create table t7(i int, j int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t7
-POSTHOOK: query: -- coor, nullability, should produce result
-create table t7(i int, j int)
+POSTHOOK: query: create table t7(i int, j int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t7
@@ -8187,11 +8139,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Output: default@t
 POSTHOOK: Lineage: t.i EXPRESSION 
[(values__tmp__table__7)values__tmp__table__7.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 POSTHOOK: Lineage: t.j EXPRESSION 
[(values__tmp__table__7)values__tmp__table__7.FieldSchema(name:tmp_values_col2, 
type:string, comment:), ]
-PREHOOK: query: -- case with empty inner result (t1.j=t.j=NULL) and null 
subquery key(t.j = NULL)
-explain select t.i from t where t.j NOT IN (select t1.i from t t1 where 
t1.j=t.j)
+PREHOOK: query: explain select t.i from t where t.j NOT IN (select t1.i from t 
t1 where t1.j=t.j)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- case with empty inner result (t1.j=t.j=NULL) and null 
subquery key(t.j = NULL)
-explain select t.i from t where t.j NOT IN (select t1.i from t t1 where 
t1.j=t.j)
+POSTHOOK: query: explain select t.i from t where t.j NOT IN (select t1.i from 
t t1 where t1.j=t.j)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -8509,11 +8459,9 @@ POSTHOOK: Input: default@t
 7
 1
 4
-PREHOOK: query: -- case with empty inner result (t1.j=t.j=NULL) and non-null 
subquery key(t.i is never null)
-explain select t.i from t where t.i NOT IN (select t1.i from t t1 where 
t1.j=t.j)
+PREHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from t 
t1 where t1.j=t.j)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- case with empty inner result (t1.j=t.j=NULL) and non-null 
subquery key(t.i is never null)
-explain select t.i from t where t.i NOT IN (select t1.i from t t1 where 
t1.j=t.j)
+POSTHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from 
t t1 where t1.j=t.j)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -8830,11 +8778,9 @@ POSTHOOK: Input: default@t
 #### A masked pattern was here ####
 7
 Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- case with non-empty inner result and null subquery key(t.j 
is null)
-explain select t.i from t where t.j NOT IN (select t1.i from t t1 )
+PREHOOK: query: explain select t.i from t where t.j NOT IN (select t1.i from t 
t1 )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- case with non-empty inner result and null subquery key(t.j 
is null)
-explain select t.i from t where t.j NOT IN (select t1.i from t t1 )
+POSTHOOK: query: explain select t.i from t where t.j NOT IN (select t1.i from 
t t1 )
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -8997,11 +8943,9 @@ POSTHOOK: Input: default@t
 1
 4
 Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
-PREHOOK: query: -- case with non-empty inner result and non-null subquery 
key(t.i is never null)
-explain select t.i from t where t.i NOT IN (select t1.i from t t1 )
+PREHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from t 
t1 )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- case with non-empty inner result and non-null subquery 
key(t.i is never null)
-explain select t.i from t where t.i NOT IN (select t1.i from t t1 )
+POSTHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from 
t t1 )
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -9167,8 +9111,7 @@ POSTHOOK: query: drop table t1
 POSTHOOK: type: DROPTABLE
 Warning: Shuffle Join MERGEJOIN[70][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Reducer 5' is a cross product
 Warning: Shuffle Join MERGEJOIN[72][tables = [$hdt$_2, $hdt$_3]] in Stage 
'Reducer 10' is a cross product
-PREHOOK: query: -- corr predicate is not equi
-explain select *
+PREHOOK: query: explain select *
 from src b
 where b.key not in
         (select a.key
@@ -9176,8 +9119,7 @@ where b.key not in
          where b.value > a.value and a.key > '9'
         )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- corr predicate is not equi
-explain select *
+POSTHOOK: query: explain select *
 from src b
 where b.key not in
         (select a.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_views.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
index cf963b2..22da51c 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
@@ -1,7 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- exists test
-create view cv1 as 
+PREHOOK: query: create view cv1 as 
 select * 
 from src b 
 where exists
@@ -12,10 +9,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cv1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- exists test
-create view cv1 as 
+POSTHOOK: query: create view cv1 as 
 select * 
 from src b 
 where exists
@@ -63,8 +57,7 @@ POSTHOOK: Input: default@src
 97     val_97
 98     val_98
 98     val_98
-PREHOOK: query: -- not in test
-create view cv2 as 
+PREHOOK: query: create view cv2 as 
 select * 
 from src b 
 where b.key not in
@@ -76,8 +69,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cv2
-POSTHOOK: query: -- not in test
-create view cv2 as 
+POSTHOOK: query: create view cv2 as 
 select * 
 from src b 
 where b.key not in
@@ -805,8 +797,7 @@ POSTHOOK: Input: default@src
 104    val_104
 104    val_104
 105    val_105
-PREHOOK: query: -- in where + having
-create view cv3 as
+PREHOOK: query: create view cv3 as
 select key, value, count(*) 
 from src b
 where b.key in (select key from src where src.key > '8')
@@ -816,8 +807,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cv3
-POSTHOOK: query: -- in where + having
-create view cv3 as
+POSTHOOK: query: create view cv3 as
 select key, value, count(*) 
 from src b
 where b.key in (select key from src where src.key > '8')
@@ -870,8 +860,7 @@ POSTHOOK: Input: default@src
 96     val_96  1
 97     val_97  2
 98     val_98  2
-PREHOOK: query: -- join of subquery views
-select *
+PREHOOK: query: select *
 from cv3
 where cv3.key in (select key from cv1)
 PREHOOK: type: QUERY
@@ -879,8 +868,7 @@ PREHOOK: Input: default@cv1
 PREHOOK: Input: default@cv3
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- join of subquery views
-select *
+POSTHOOK: query: select *
 from cv3
 where cv3.key in (select key from cv1)
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/table_access_keys_stats.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/table_access_keys_stats.q.out 
b/ql/src/test/results/clientpositive/llap/table_access_keys_stats.q.out
index e68f60f..48ea4ce 100644
--- a/ql/src/test/results/clientpositive/llap/table_access_keys_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/table_access_keys_stats.q.out
@@ -1,7 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
--- This test is used for testing the TableAccessAnalyzer
-
-CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
+PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T1
@@ -17,8 +14,7 @@ PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) 
STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T3
-PREHOOK: query: -- Simple group-by queries
-SELECT key, count(1) FROM T1 GROUP BY key
+PREHOOK: query: SELECT key, count(1) FROM T1 GROUP BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -45,8 +41,7 @@ Keys:key,val
 7      17      1
 8      18      1
 8      28      1
-PREHOOK: query: -- With subqueries and column aliases
-SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 GROUP BY key
+PREHOOK: query: SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 
GROUP BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -72,8 +67,7 @@ Keys:key
 3      1
 7      1
 8      2
-PREHOOK: query: -- With constants
-SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
+PREHOOK: query: SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -114,8 +108,7 @@ Keys:key,val
 7      1       17      2       1
 8      1       18      2       1
 8      1       28      2       1
-PREHOOK: query: -- no mapping with functions
-SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
+PREHOOK: query: SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -139,8 +132,7 @@ Keys:key
 2.0    1
 4.0    1
 6.0    1
-PREHOOK: query: -- group by followed by union
-SELECT * FROM (
+PREHOOK: query: SELECT * FROM (
 SELECT key, count(1) as c FROM T1 GROUP BY key
  UNION ALL
 SELECT key, count(1) as c FROM T1 GROUP BY key
@@ -166,8 +158,7 @@ Keys:key
 7      1
 8      2
 8      2
-PREHOOK: query: -- group by followed by a join
-SELECT * FROM
+PREHOOK: query: SELECT * FROM
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq1
 JOIN
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq2
@@ -211,8 +202,7 @@ Keys:key,val
 7      1       7       17      1
 8      2       8       18      1
 8      2       8       28      1
-PREHOOK: query: -- constants from sub-queries should work fine
-SELECT key, constant, val, count(1) from
+PREHOOK: query: SELECT key, constant, val, count(1) from
 (SELECT key, 1 as constant, val from T1) subq1
 group by key, constant, val
 PREHOOK: type: QUERY
@@ -228,8 +218,7 @@ Keys:key,val
 7      1       17      1
 8      1       18      1
 8      1       28      1
-PREHOOK: query: -- multiple levels of constants from sub-queries should work 
fine
-SELECT key, constant3, val, count(1) FROM
+PREHOOK: query: SELECT key, constant3, val, count(1) FROM
 (
   SELECT key, constant AS constant2, val, 2 AS constant3
   FROM
@@ -252,8 +241,7 @@ Keys:key,val
 7      2       17      1
 8      2       18      1
 8      2       28      1
-PREHOOK: query: -- work with insert overwrite
-FROM T1
+PREHOOK: query: FROM T1
 INSERT OVERWRITE TABLE T2 SELECT key, count(1) GROUP BY key, 1
 INSERT OVERWRITE TABLE T3 SELECT key, sum(val) GROUP BY key
 PREHOOK: type: QUERY
@@ -268,8 +256,7 @@ Operator:GBY_8
 Table:default@t1
 Keys:key
 
-PREHOOK: query: -- simple joins
-SELECT *
+PREHOOK: query: SELECT *
 FROM T1 JOIN T2
 ON T1.key = t2.key
 ORDER BY T1.key ASC, T1.val ASC
@@ -302,8 +289,7 @@ Keys:key,val
 Table:default@t2
 Keys:key,val
 
-PREHOOK: query: -- map join
-SELECT /*+ MAPJOIN(a) */ * 
+PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * 
 FROM T1 a JOIN T2 b 
 ON a.key = b.key
 PREHOOK: type: QUERY
@@ -322,8 +308,7 @@ Keys:key
 7      17      7       1
 8      18      8       2
 8      28      8       2
-PREHOOK: query: -- with constant in join condition
-SELECT *
+PREHOOK: query: SELECT *
 FROM T1 JOIN T2
 ON T1.key = T2.key AND T1.val = 3 and T2.val = 3
 PREHOOK: type: QUERY
@@ -336,8 +321,7 @@ Keys:key
 Table:default@t2
 Keys:key
 
-PREHOOK: query: -- subqueries
-SELECT *
+PREHOOK: query: SELECT *
 FROM 
 (
   SELECT val FROM T1 WHERE key = 5  
@@ -375,8 +359,7 @@ Keys:val
 Table:default@t2
 Keys:val
 
-PREHOOK: query: -- with column aliases in subqueries
-SELECT *
+PREHOOK: query: SELECT *
 FROM
 (
   SELECT val as v FROM T1 WHERE key = 5
@@ -396,8 +379,7 @@ Keys:val
 Table:default@t2
 Keys:val
 
-PREHOOK: query: -- with constants in subqueries
-SELECT *
+PREHOOK: query: SELECT *
 FROM
 (
   SELECT key, val FROM T1
@@ -417,8 +399,7 @@ Keys:key
 Table:default@t2
 Keys:key
 
-PREHOOK: query: -- multiple levels of constants in subqueries
-SELECT *
+PREHOOK: query: SELECT *
 FROM
 (
   SELECT key, val from 
@@ -441,8 +422,7 @@ Keys:key
 Table:default@t2
 Keys:key
 
-PREHOOK: query: -- no mapping on functions
-SELECT *
+PREHOOK: query: SELECT *
 FROM
 (
   SELECT key, val from T1
@@ -456,8 +436,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-PREHOOK: query: -- join followed by group by
-SELECT subq1.val, COUNT(*)
+PREHOOK: query: SELECT subq1.val, COUNT(*)
 FROM
 (
   SELECT key, val FROM T1
@@ -478,8 +457,7 @@ Keys:key
 Table:default@t2
 Keys:key
 
-PREHOOK: query: -- join followed by union
-SELECT * 
+PREHOOK: query: SELECT * 
 FROM
 (
   SELECT subq1.val, COUNT(*)
@@ -519,8 +497,7 @@ Keys:val
 17.0   1
 46.0   1
 Warning: Shuffle Join MERGEJOIN[29][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 4' is a cross product
-PREHOOK: query: -- join followed by join
-SELECT *
+PREHOOK: query: SELECT *
 FROM
 (
   SELECT subq1.val as val, COUNT(*)
@@ -548,8 +525,7 @@ Keys:key
 Table:default@t2
 Keys:key
 
-PREHOOK: query: -- simple joins
-SELECT *
+PREHOOK: query: SELECT *
 FROM T1 JOIN T2
 ON T1.key = t2.key
 ORDER BY T1.key ASC, T1.val ASC
@@ -582,8 +558,7 @@ Keys:key,val
 Table:default@t2
 Keys:key,val
 
-PREHOOK: query: -- group by followed by a join
-SELECT * FROM
+PREHOOK: query: SELECT * FROM
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq1
 JOIN
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq2

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_dml.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_dml.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dml.q.out
index d09c1f9..786929e 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dml.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dml.q.out
@@ -1,12 +1,6 @@
-PREHOOK: query: -- CTAS
--- SORT_QUERY_RESULTS
-
-EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS 
cnt FROM src GROUP BY value) f1 ORDER BY cnt
+PREHOOK: query: EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, 
count(value) AS cnt FROM src GROUP BY value) f1 ORDER BY cnt
 PREHOOK: type: CREATETABLE_AS_SELECT
-POSTHOOK: query: -- CTAS
--- SORT_QUERY_RESULTS
-
-EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS 
cnt FROM src GROUP BY value) f1 ORDER BY cnt
+POSTHOOK: query: EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, 
count(value) AS cnt FROM src GROUP BY value) f1 ORDER BY cnt
 POSTHOOK: type: CREATETABLE_AS_SELECT
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -427,13 +421,11 @@ val_95    2
 val_96 1
 val_97 2
 val_98 2
-PREHOOK: query: -- dyn partitions
-CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
+PREHOOK: query: CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmp_src_part
-POSTHOOK: query: -- dyn partitions
-CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
+POSTHOOK: query: CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmp_src_part
@@ -834,13 +826,11 @@ val_95    2
 val_96 1
 val_97 2
 val_98 2
-PREHOOK: query: -- multi insert
-CREATE TABLE even (c int, d string)
+PREHOOK: query: CREATE TABLE even (c int, d string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@even
-POSTHOOK: query: -- multi insert
-CREATE TABLE even (c int, d string)
+POSTHOOK: query: CREATE TABLE even (c int, d string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@even
@@ -1476,14 +1466,12 @@ POSTHOOK: Input: default@odd
 95     val_95
 97     val_97
 97     val_97
-PREHOOK: query: -- create empty table
-CREATE TABLE empty STORED AS orc AS SELECT * FROM tmp_src_part WHERE d = -1000
+PREHOOK: query: CREATE TABLE empty STORED AS orc AS SELECT * FROM tmp_src_part 
WHERE d = -1000
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@tmp_src_part
 PREHOOK: Output: database:default
 PREHOOK: Output: default@empty
-POSTHOOK: query: -- create empty table
-CREATE TABLE empty STORED AS orc AS SELECT * FROM tmp_src_part WHERE d = -1000
+POSTHOOK: query: CREATE TABLE empty STORED AS orc AS SELECT * FROM 
tmp_src_part WHERE d = -1000
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@tmp_src_part
 POSTHOOK: Output: database:default
@@ -1498,13 +1486,11 @@ POSTHOOK: query: SELECT * FROM empty
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@empty
 #### A masked pattern was here ####
-PREHOOK: query: -- drop the tables
-DROP TABLE even
+PREHOOK: query: DROP TABLE even
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@even
 PREHOOK: Output: default@even
-POSTHOOK: query: -- drop the tables
-DROP TABLE even
+POSTHOOK: query: DROP TABLE even
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@even
 POSTHOOK: Output: default@even

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
index 25c6f15..b4c162f 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
@@ -1,5 +1,4 @@
-PREHOOK: query: -- First try with regular mergejoin
-explain
+PREHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -7,8 +6,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 order by a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- First try with regular mergejoin
-explain
+POSTHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -411,8 +409,7 @@ POSTHOOK: Input: default@alltypesorc
 -3799  1
 10782  1
 NULL   6
-PREHOOK: query: -- Try with dynamically partitioned hashjoin
-explain
+PREHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -420,8 +417,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 order by a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Try with dynamically partitioned hashjoin
-explain
+POSTHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
index b44ab7d..f434a1e 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_2.q.out
@@ -1,6 +1,4 @@
-PREHOOK: query: -- Multiple tables, and change the order of the big table 
(alltypesorc)
--- First try with regular mergejoin
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -12,9 +10,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Multiple tables, and change the order of the big table 
(alltypesorc)
--- First try with regular mergejoin
-explain
+POSTHOOK: query: explain
 select
   a.*
 from
@@ -193,9 +189,7 @@ NULL        67      790444583       -1645852809     NULL    
67.0    xptM81y xH7445Rals48VOulSyR5F   NULL    1969-
 39     74      626923679       NULL    39.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 16:00:10.403 1969-12-31 16:00:12.52  true    NULL
 47     74      626923679       NULL    47.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 15:59:57.849 1969-12-31 15:59:57.569 true    NULL
 -22    77      528534767       NULL    -22.0   77.0    cvLH6Eat2yFsyy7p        
NULL    1969-12-31 15:59:45.928 1969-12-31 15:59:43.621 true    NULL
-PREHOOK: query: -- noconditionaltask.size needs to be low enough that entire 
filtered table results do not fit in one task's hash table
--- Try with dynamically partitioned hash join 
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -207,9 +201,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- noconditionaltask.size needs to be low enough that entire 
filtered table results do not fit in one task's hash table
--- Try with dynamically partitioned hash join 
-explain
+POSTHOOK: query: explain
 select
   a.*
 from
@@ -388,8 +380,7 @@ NULL        67      790444583       -1645852809     NULL    
67.0    xptM81y xH7445Rals48VOulSyR5F   NULL    1969-
 39     74      626923679       NULL    39.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 16:00:10.403 1969-12-31 16:00:12.52  true    NULL
 47     74      626923679       NULL    47.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 15:59:57.849 1969-12-31 15:59:57.569 true    NULL
 -22    77      528534767       NULL    -22.0   77.0    cvLH6Eat2yFsyy7p        
NULL    1969-12-31 15:59:45.928 1969-12-31 15:59:43.621 true    NULL
-PREHOOK: query: -- Try different order of tables
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -401,8 +392,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Try different order of tables
-explain
+POSTHOOK: query: explain
 select
   a.*
 from

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out 
b/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out
index 2859946..64c6b5b 100644
--- a/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_join_hash.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_src (key string, value string) STORED AS ORC
+PREHOOK: query: create table orc_src (key string, value string) STORED AS ORC
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_src
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_src (key string, value string) STORED AS ORC
+POSTHOOK: query: create table orc_src (key string, value string) STORED AS ORC
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_src

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out 
b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
index fd18117..ff47bcd 100644
--- a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
@@ -374,9 +374,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table ct_events1_test
+PREHOOK: query: create table ct_events1_test
 as select  a.*,
 b.svcrqst_id,
 b.svcrqct_cds,
@@ -394,9 +392,7 @@ PREHOOK: Input: default@ct_events_clean
 PREHOOK: Input: default@service_request_clean
 PREHOOK: Output: database:default
 PREHOOK: Output: default@ct_events1_test
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table ct_events1_test
+POSTHOOK: query: create table ct_events1_test
 as select  a.*,
 b.svcrqst_id,
 b.svcrqct_cds,
@@ -1358,9 +1354,7 @@ STAGE PLANS:
           hdfs directory: true
 #### A masked pattern was here ####
 
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table ct_events1_test
+PREHOOK: query: create table ct_events1_test
 as select  a.*,
 b.svcrqst_id,
 b.svcrqct_cds,
@@ -1378,9 +1372,7 @@ PREHOOK: Input: default@ct_events_clean
 PREHOOK: Input: default@service_request_clean
 PREHOOK: Output: database:default
 PREHOOK: Output: default@ct_events1_test
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table ct_events1_test
+POSTHOOK: query: create table ct_events1_test
 as select  a.*,
 b.svcrqst_id,
 b.svcrqct_cds,

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_join_tests.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_join_tests.q.out 
b/ql/src/test/results/clientpositive/llap/tez_join_tests.q.out
index e223666..4fa5854 100644
--- a/ql/src/test/results/clientpositive/llap/tez_join_tests.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_join_tests.q.out
@@ -1,11 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+PREHOOK: query: explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+POSTHOOK: query: explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_joins_explain.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_joins_explain.q.out 
b/ql/src/test/results/clientpositive/llap/tez_joins_explain.q.out
index 18b0a5b..b32e990 100644
--- a/ql/src/test/results/clientpositive/llap/tez_joins_explain.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_joins_explain.q.out
@@ -1,9 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-explain
+PREHOOK: query: explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-explain
+POSTHOOK: query: explain
 select * from (select b.key, b.value from src1 a left outer join src b on 
(a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) 
order by x.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_multi_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_multi_union.q.out 
b/ql/src/test/results/clientpositive/llap/tez_multi_union.q.out
index fbc1c2f..b99f746 100644
--- a/ql/src/test/results/clientpositive/llap/tez_multi_union.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_multi_union.q.out
@@ -1,5 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-select key from
+PREHOOK: query: select key from
 (
 select key from src
 union all
@@ -10,8 +9,7 @@ select key from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-select key from
+POSTHOOK: query: select key from
 (
 select key from src
 union all

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out 
b/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
index 548035d..346ec38 100644
--- a/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_schema_evolution.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table test (key int, value string) partitioned by (p int) stored as 
textfile
+PREHOOK: query: create table test (key int, value string) partitioned by (p 
int) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@test
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table test (key int, value string) partitioned by (p int) stored as 
textfile
+POSTHOOK: query: create table test (key int, value string) partitioned by (p 
int) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@test

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out 
b/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out
index 8333037..584a0fa 100644
--- a/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_smb_empty.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE srcbucket_mapjoin(key int, value string) partitioned by (ds 
string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+PREHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) 
partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@srcbucket_mapjoin
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE srcbucket_mapjoin(key int, value string) partitioned by (ds 
string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+POSTHOOK: query: CREATE TABLE srcbucket_mapjoin(key int, value string) 
partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@srcbucket_mapjoin

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_union_multiinsert.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_union_multiinsert.q.out 
b/ql/src/test/results/clientpositive/llap/tez_union_multiinsert.q.out
index 113a925..de6f8e3 100644
--- a/ql/src/test/results/clientpositive/llap/tez_union_multiinsert.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_union_multiinsert.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
+PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS 
TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index 7664c44..d6f01dc 100644
--- 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
@@ -1,5 +1,4 @@
-PREHOOK: query: -- First try with regular mergejoin
-explain
+PREHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -7,8 +6,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 order by a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- First try with regular mergejoin
-explain
+POSTHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -411,8 +409,7 @@ POSTHOOK: Input: default@alltypesorc
 -3799  1
 10782  1
 NULL   6
-PREHOOK: query: -- Try with dynamically partitioned hashjoin
-explain
+PREHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -420,8 +417,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 order by a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Try with dynamically partitioned hashjoin
-explain
+POSTHOOK: query: explain
 select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
index 189841a..9c1b3af 100644
--- 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_2.q.out
@@ -1,6 +1,4 @@
-PREHOOK: query: -- Multiple tables, and change the order of the big table 
(alltypesorc)
--- First try with regular mergejoin
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -12,9 +10,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Multiple tables, and change the order of the big table 
(alltypesorc)
--- First try with regular mergejoin
-explain
+POSTHOOK: query: explain
 select
   a.*
 from
@@ -193,9 +189,7 @@ NULL        67      790444583       -1645852809     NULL    
67.0    xptM81y xH7445Rals48VOulSyR5F   NULL    1969-
 39     74      626923679       NULL    39.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 16:00:10.403 1969-12-31 16:00:12.52  true    NULL
 47     74      626923679       NULL    47.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 15:59:57.849 1969-12-31 15:59:57.569 true    NULL
 -22    77      528534767       NULL    -22.0   77.0    cvLH6Eat2yFsyy7p        
NULL    1969-12-31 15:59:45.928 1969-12-31 15:59:43.621 true    NULL
-PREHOOK: query: -- noconditionaltask.size needs to be low enough that entire 
filtered table results do not fit in one task's hash table
--- Try with dynamically partitioned hash join 
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -207,9 +201,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- noconditionaltask.size needs to be low enough that entire 
filtered table results do not fit in one task's hash table
--- Try with dynamically partitioned hash join 
-explain
+POSTHOOK: query: explain
 select
   a.*
 from
@@ -388,8 +380,7 @@ NULL        67      790444583       -1645852809     NULL    
67.0    xptM81y xH7445Rals48VOulSyR5F   NULL    1969-
 39     74      626923679       NULL    39.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 16:00:10.403 1969-12-31 16:00:12.52  true    NULL
 47     74      626923679       NULL    47.0    74.0    821UdmGbkEf4j   NULL    
1969-12-31 15:59:57.849 1969-12-31 15:59:57.569 true    NULL
 -22    77      528534767       NULL    -22.0   77.0    cvLH6Eat2yFsyy7p        
NULL    1969-12-31 15:59:45.928 1969-12-31 15:59:43.621 true    NULL
-PREHOOK: query: -- Try different order of tables
-explain
+PREHOOK: query: explain
 select
   a.*
 from
@@ -401,8 +392,7 @@ where
   and (a.csmallint < 100)
 order by a.csmallint, a.ctinyint, a.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Try different order of tables
-explain
+POSTHOOK: query: explain
 select
   a.*
 from

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/uber_reduce.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/uber_reduce.q.out 
b/ql/src/test/results/clientpositive/llap/uber_reduce.q.out
index 2a29131..6fa0e6a 100644
--- a/ql/src/test/results/clientpositive/llap/uber_reduce.q.out
+++ b/ql/src/test/results/clientpositive/llap/uber_reduce.q.out
@@ -1,14 +1,8 @@
-PREHOOK: query: -- Uberized mode is a YARN option, ignore this test for 
non-YARN Hadoop versions
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
-
-CREATE TABLE T1(key STRING, val STRING)
+PREHOOK: query: CREATE TABLE T1(key STRING, val STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T1
-POSTHOOK: query: -- Uberized mode is a YARN option, ignore this test for 
non-YARN Hadoop versions
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S)
-
-CREATE TABLE T1(key STRING, val STRING)
+POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@T1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out 
b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
index c622f96..aa55979 100644
--- a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
@@ -22,17 +22,13 @@ POSTHOOK: type: DESCFUNCTION
 collect_list(x) - Returns a list of objects with duplicates
 Function class:org.apache.hadoop.hive.ql.udf.generic.GenericUDAFCollectList
 Function type:BUILTIN
-PREHOOK: query: -- initialize tables
-
-CREATE TABLE customers (id int, name varchar(10), age int)
+PREHOOK: query: CREATE TABLE customers (id int, name varchar(10), age int)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@customers
-POSTHOOK: query: -- initialize tables
-
-CREATE TABLE customers (id int, name varchar(10), age int)
+POSTHOOK: query: CREATE TABLE customers (id int, name varchar(10), age int)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 POSTHOOK: type: CREATETABLE
@@ -90,11 +86,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
"../../data/files/nested_orders.txt" INT
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@nested_orders
-PREHOOK: query: -- 1. test struct
-
--- 1.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -102,11 +94,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. test struct
-
--- 1.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -136,9 +124,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
-PREHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -146,9 +132,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -216,9 +200,7 @@ POSTHOOK: Input: default@orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
-PREHOOK: query: -- 1.2 when field is map
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -226,9 +208,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1.2 when field is map
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -296,9 +276,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: -- 1.3 when field is list
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -306,9 +284,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1.3 when field is list
-
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -376,11 +352,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}]
-PREHOOK: query: -- 2. test array
-
--- 2.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(array(o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -388,11 +360,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. test array
-
--- 2.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(array(o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(array(o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -422,9 +390,7 @@ POSTHOOK: Input: default@orders
 1      [[21.45],[21.45],[29.36]]
 2      [[3.65],[27.45],[126.57]]
 3      [[30.5],[210.03]]
-PREHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(array(cast(o.amount as decimal(10,1)))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(array(cast(o.amount as 
decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -432,9 +398,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(array(cast(o.amount as decimal(10,1)))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(array(cast(o.amount as 
decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -464,9 +428,7 @@ POSTHOOK: Input: default@orders
 1      [[21.5],[21.5],[29.4]]
 2      [[3.7],[27.5],[126.6]]
 3      [[30.5],[210]]
-PREHOOK: query: -- 2.2 when field is struct
-
-SELECT c.id, sort_array(collect_set(array(o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -474,9 +436,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2.2 when field is struct
-
-SELECT c.id, sort_array(collect_set(array(o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(array(o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -506,9 +466,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"grape\"":1200.5,"\"rice\"":29.36}]]
 2      
[[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]]
 3      
[[{"\"apple\"":30.5,"\"orange\"":41.35}],[{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}]]
-PREHOOK: query: -- 2.3 when field is list
-
-SELECT c.id, sort_array(collect_set(array(map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(array(map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -516,9 +474,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2.3 when field is list
-
-SELECT c.id, sort_array(collect_set(array(map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(array(map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -548,11 +504,7 @@ POSTHOOK: Input: default@nested_orders
 1      [[[21.45,15.2]],[[21.45,15.2]],[[1200.5,29.36]]]
 2      [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]]
 3      [[[30.5,41.35]],[[210.03,100.56,500.0]]]
-PREHOOK: query: -- 3. test map
-
--- 3.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(map("amount", o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -560,11 +512,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3. test map
-
--- 3.1 when field is primitive
-
-SELECT c.id, sort_array(collect_set(map("amount", o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -594,9 +542,7 @@ POSTHOOK: Input: default@orders
 1      [{"amount":21.45},{"amount":21.45},{"amount":29.36}]
 2      [{"amount":3.65},{"amount":27.45},{"amount":126.57}]
 3      [{"amount":30.5},{"amount":210.03}]
-PREHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(map("amount", cast(o.amount as 
decimal(10,1)))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", 
cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -604,9 +550,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- cast decimal
-
-SELECT c.id, sort_array(collect_set(map("amount", cast(o.amount as 
decimal(10,1)))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", 
cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -636,9 +580,7 @@ POSTHOOK: Input: default@orders
 1      [{"amount":21.5},{"amount":21.5},{"amount":29.4}]
 2      [{"amount":3.7},{"amount":27.5},{"amount":126.6}]
 3      [{"amount":30.5},{"amount":210}]
-PREHOOK: query: -- 3.2 when field is struct
-
-SELECT c.id, sort_array(collect_set(map("sub", o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -646,9 +588,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3.2 when field is struct
-
-SELECT c.id, sort_array(collect_set(map("sub", o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -678,9 +618,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}]
 3      
[{"sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: -- 3.3 when field is list
-
-SELECT c.id, sort_array(collect_set(map("sub", map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -688,9 +626,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3.3 when field is list
-
-SELECT c.id, sort_array(collect_set(map("sub", map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -720,13 +656,9 @@ POSTHOOK: Input: default@nested_orders
 1      [{"sub":[21.45,15.2]},{"sub":[21.45,15.2]},{"sub":[1200.5,29.36]}]
 2      [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}]
 3      [{"sub":[30.5,41.35]},{"sub":[210.03,100.56,500.0]}]
-PREHOOK: query: -- clean up
-
-DROP TABLE customer
+PREHOOK: query: DROP TABLE customer
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- clean up
-
-DROP TABLE customer
+POSTHOOK: query: DROP TABLE customer
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: DROP TABLE orders
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union2.q.out 
b/ql/src/test/results/clientpositive/llap/union2.q.out
index c1f6837..c793cbd 100644
--- a/ql/src/test/results/clientpositive/llap/union2.q.out
+++ b/ql/src/test/results/clientpositive/llap/union2.q.out
@@ -1,14 +1,8 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
--- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
-
-explain 
+PREHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2) 
unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
--- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
-
-explain 
+POSTHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2) 
unionsrc
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union3.q.out 
b/ql/src/test/results/clientpositive/llap/union3.q.out
index 6e28152..f503283 100644
--- a/ql/src/test/results/clientpositive/llap/union3.q.out
+++ b/ql/src/test/results/clientpositive/llap/union3.q.out
@@ -1,6 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+PREHOOK: query: explain
 SELECT *
 FROM (
   SELECT 1 AS id
@@ -17,9 +15,7 @@ FROM (
   CLUSTER BY id
 ) a
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+POSTHOOK: query: explain
 SELECT *
 FROM (
   SELECT 1 AS id

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union4.q.out 
b/ql/src/test/results/clientpositive/llap/union4.q.out
index 85d60bf..a389608 100644
--- a/ql/src/test/results/clientpositive/llap/union4.q.out
+++ b/ql/src/test/results/clientpositive/llap/union4.q.out
@@ -1,18 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- union case: both subqueries are map-reduce jobs on same input, followed by 
filesink
-
-
-create table tmptable(key string, value int)
+PREHOOK: query: create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- union case: both subqueries are map-reduce jobs on same input, followed by 
filesink
-
-
-create table tmptable(key string, value int)
+POSTHOOK: query: create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmptable

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union5.q.out 
b/ql/src/test/results/clientpositive/llap/union5.q.out
index 856f9f6..c0f98c1 100644
--- a/ql/src/test/results/clientpositive/llap/union5.q.out
+++ b/ql/src/test/results/clientpositive/llap/union5.q.out
@@ -1,15 +1,9 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
--- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1
                                     UNION  ALL  
                                       select 'tst2' as key, count(1) as value 
from src s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
--- union case: both subqueries are map-reduce jobs on same input, followed by 
reduce sink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value 
from src s1
                                     UNION  ALL  
                                       select 'tst2' as key, count(1) as value 
from src s2) unionsrc group by unionsrc.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union6.q.out 
b/ql/src/test/results/clientpositive/llap/union6.q.out
index 1b1edf8..70bb1b6 100644
--- a/ql/src/test/results/clientpositive/llap/union6.q.out
+++ b/ql/src/test/results/clientpositive/llap/union6.q.out
@@ -1,16 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by filesink
-
-create table tmptable(key string, value string)
+PREHOOK: query: create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by filesink
-
-create table tmptable(key string, value string)
+POSTHOOK: query: create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmptable

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union7.q.out 
b/ql/src/test/results/clientpositive/llap/union7.q.out
index 4039b7d..6006060 100644
--- a/ql/src/test/results/clientpositive/llap/union7.q.out
+++ b/ql/src/test/results/clientpositive/llap/union7.q.out
@@ -1,15 +1,9 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
--- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src1 s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
--- union case: 1 subquery is a map-reduce job, different inputs for 
sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as 
string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src1 s2) unionsrc group by unionsrc.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union8.q.out 
b/ql/src/test/results/clientpositive/llap/union8.q.out
index 1e54073..4f3be5f 100644
--- a/ql/src/test/results/clientpositive/llap/union8.q.out
+++ b/ql/src/test/results/clientpositive/llap/union8.q.out
@@ -1,15 +1,9 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
--- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by filesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src s2 UNION  ALL  
                                             select s3.key as key, s3.value as 
value from src s3) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
--- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by filesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as 
value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as 
value from src s2 UNION  ALL  
                                             select s3.key as key, s3.value as 
value from src s3) unionsrc

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union9.q.out 
b/ql/src/test/results/clientpositive/llap/union9.q.out
index bb70d74..aba4721 100644
--- a/ql/src/test/results/clientpositive/llap/union9.q.out
+++ b/ql/src/test/results/clientpositive/llap/union9.q.out
@@ -1,15 +1,9 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
--- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2 
UNION ALL
                         select s3.key as key, s3.value as value from src s3) 
unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
--- union case: all subqueries are a map-only jobs, 3 way union, same input for 
all sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 
UNION  ALL  
                         select s2.key as key, s2.value as value from src s2 
UNION ALL
                         select s3.key as key, s3.value as value from src s3) 
unionsrc

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out 
b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
index 10609d9..7cc6324 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
@@ -1,13 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE u1 as select key, value from src order by key limit 5
+PREHOOK: query: CREATE TABLE u1 as select key, value from src order by key 
limit 5
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@u1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE u1 as select key, value from src order by key limit 5
+POSTHOOK: query: CREATE TABLE u1 as select key, value from src order by key 
limit 5
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/union_remove_26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union_remove_26.q.out 
b/ql/src/test/results/clientpositive/llap/union_remove_26.q.out
index 797b947..718c8b9 100644
--- a/ql/src/test/results/clientpositive/llap/union_remove_26.q.out
+++ b/ql/src/test/results/clientpositive/llap/union_remove_26.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- This is to test the union remove optimization with stats 
optimization
-
-create table inputSrcTbl1(key string, val int) stored as textfile
+PREHOOK: query: create table inputSrcTbl1(key string, val int) stored as 
textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@inputSrcTbl1
-POSTHOOK: query: -- This is to test the union remove optimization with stats 
optimization
-
-create table inputSrcTbl1(key string, val int) stored as textfile
+POSTHOOK: query: create table inputSrcTbl1(key string, val int) stored as 
textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@inputSrcTbl1
@@ -104,13 +100,11 @@ POSTHOOK: Input: default@inputsrctbl3
 POSTHOOK: Output: default@inputtbl3
 POSTHOOK: Lineage: inputtbl3.key SIMPLE 
[(inputsrctbl3)inputsrctbl3.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: inputtbl3.val SIMPLE 
[(inputsrctbl3)inputsrctbl3.FieldSchema(name:val, type:int, comment:null), ]
-PREHOOK: query: --- union remove optimization effects, stats optimization does 
not though it is on since inputTbl2 column stats is not available
-analyze table inputTbl1 compute statistics for columns
+PREHOOK: query: analyze table inputTbl1 compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl1
 #### A masked pattern was here ####
-POSTHOOK: query: --- union remove optimization effects, stats optimization 
does not though it is on since inputTbl2 column stats is not available
-analyze table inputTbl1 compute statistics for columns
+POSTHOOK: query: analyze table inputTbl1 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl1
 #### A masked pattern was here ####
@@ -285,13 +279,11 @@ POSTHOOK: Input: default@inputtbl2
 POSTHOOK: Input: default@inputtbl3
 #### A masked pattern was here ####
 3
-PREHOOK: query: --- union remove optimization and stats optimization are 
effective after inputTbl2 column stats is calculated
-analyze table inputTbl2 compute statistics for columns
+PREHOOK: query: analyze table inputTbl2 compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@inputtbl2
 #### A masked pattern was here ####
-POSTHOOK: query: --- union remove optimization and stats optimization are 
effective after inputTbl2 column stats is calculated
-analyze table inputTbl2 compute statistics for columns
+POSTHOOK: query: analyze table inputTbl2 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@inputtbl2
 #### A masked pattern was here ####
@@ -342,16 +334,14 @@ POSTHOOK: Input: default@inputtbl2
 POSTHOOK: Input: default@inputtbl3
 #### A masked pattern was here ####
 3
-PREHOOK: query: --- union remove optimization effects but stats optimization 
does not (with group by) though it is on
-explain
+PREHOOK: query: explain
   SELECT key, count(1) as rowcnt, min(val) as ms, max(val) as mx from 
inputTbl1 group by key
   UNION ALL
   SELECT key, count(1) as rowcnt, min(val) as ms, max(val) as mx from 
inputTbl2 group by key
   UNION ALL
   SELECT key, count(1) as rowcnt, min(val) as ms, max(val) as mx from 
inputTbl3 group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: --- union remove optimization effects but stats optimization 
does not (with group by) though it is on
-explain
+POSTHOOK: query: explain
   SELECT key, count(1) as rowcnt, min(val) as ms, max(val) as mx from 
inputTbl1 group by key
   UNION ALL
   SELECT key, count(1) as rowcnt, min(val) as ms, max(val) as mx from 
inputTbl2 group by key

Reply via email to