You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2017/01/19 04:29:18 UTC

[06/20] hive git commit: IVE-15297: Hive should not split semicolon within quoted string literals (Pengcheng Xiong, reviewed by Ashutosh Chauhan) (addendum I)

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/special_character_in_tabnames_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/special_character_in_tabnames_1.q.out b/ql/src/test/results/clientpositive/llap/special_character_in_tabnames_1.q.out
index d5cedc4..51be593 100644
--- a/ql/src/test/results/clientpositive/llap/special_character_in_tabnames_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/special_character_in_tabnames_1.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table `c/b/o_t1`(key string, value string, c_int int, c_float float, c_boolean boolean)  partitioned by (dt string) row format delimited fields terminated by ',' STORED AS TEXTFILE
+PREHOOK: query: create table `c/b/o_t1`(key string, value string, c_int int, c_float float, c_boolean boolean)  partitioned by (dt string) row format delimited fields terminated by ',' STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@c/b/o_t1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table `c/b/o_t1`(key string, value string, c_int int, c_float float, c_boolean boolean)  partitioned by (dt string) row format delimited fields terminated by ',' STORED AS TEXTFILE
+POSTHOOK: query: create table `c/b/o_t1`(key string, value string, c_int int, c_float float, c_boolean boolean)  partitioned by (dt string) row format delimited fields terminated by ',' STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@c/b/o_t1
@@ -376,15 +372,11 @@ POSTHOOK: Input: default@cbo_/t3////
 #### A masked pattern was here ####
 1	12	6
 1	2	6
-PREHOOK: query: -- 21. Test groupby is empty and there is no other cols in aggr
-
-select unionsrc.key FROM (select 'tst1' as key, count(1) as value from src) unionsrc
+PREHOOK: query: select unionsrc.key FROM (select 'tst1' as key, count(1) as value from src) unionsrc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- 21. Test groupby is empty and there is no other cols in aggr
-
-select unionsrc.key FROM (select 'tst1' as key, count(1) as value from src) unionsrc
+POSTHOOK: query: select unionsrc.key FROM (select 'tst1' as key, count(1) as value from src) unionsrc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -479,22 +471,14 @@ POSTHOOK: Input: default@cbo_/t3////
 avg	1
 max	1
 min	1
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- 4. Test Select + Join + TS
-
-select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join             `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
+PREHOOK: query: select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join             `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- 4. Test Select + Join + TS
-
-select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join             `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
+POSTHOOK: query: select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join             `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
@@ -7453,18 +7437,14 @@ NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
-PREHOOK: query: -- 5. Test Select + Join + FIL + TS
-
-select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key where (`c/b/o_t1`.c_int + `//cbo_t2`.c_int == 2) and (`c/b/o_t1`.c_int > 0 or `//cbo_t2`.c_float >= 0)
+PREHOOK: query: select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key where (`c/b/o_t1`.c_int + `//cbo_t2`.c_int == 2) and (`c/b/o_t1`.c_int > 0 or `//cbo_t2`.c_float >= 0)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 5. Test Select + Join + FIL + TS
-
-select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key where (`c/b/o_t1`.c_int + `//cbo_t2`.c_int == 2) and (`c/b/o_t1`.c_int > 0 or `//cbo_t2`.c_float >= 0)
+POSTHOOK: query: select `c/b/o_t1`.c_int, `//cbo_t2`.c_int from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key where (`c/b/o_t1`.c_int + `//cbo_t2`.c_int == 2) and (`c/b/o_t1`.c_int > 0 or `//cbo_t2`.c_float >= 0)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
@@ -15513,16 +15493,12 @@ POSTHOOK: Input: default@cbo_/t3////
 1	1	1 	1.0	1
 1	1	1 	1.0	1
 1	1	1 	1.0	1
-PREHOOK: query: -- 7. Test Select + TS + Join + Fil + GB + GB Having + Limit
-
-select key, (c_int+1)+2 as x, sum(c_int) from `c/b/o_t1` group by c_float, `c/b/o_t1`.c_int, key order by x limit 1
+PREHOOK: query: select key, (c_int+1)+2 as x, sum(c_int) from `c/b/o_t1` group by c_float, `c/b/o_t1`.c_int, key order by x limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 7. Test Select + TS + Join + Fil + GB + GB Having + Limit
-
-select key, (c_int+1)+2 as x, sum(c_int) from `c/b/o_t1` group by c_float, `c/b/o_t1`.c_int, key order by x limit 1
+POSTHOOK: query: select key, (c_int+1)+2 as x, sum(c_int) from `c/b/o_t1` group by c_float, `c/b/o_t1`.c_int, key order by x limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
@@ -15605,18 +15581,14 @@ POSTHOOK: Input: default@cbo_/t3////
 #### A masked pattern was here ####
 1	12	6
 1	2	6
-PREHOOK: query: -- 12. SemiJoin
-
-select `c/b/o_t1`.c_int           from `c/b/o_t1` left semi join   `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
+PREHOOK: query: select `c/b/o_t1`.c_int           from `c/b/o_t1` left semi join   `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 12. SemiJoin
-
-select `c/b/o_t1`.c_int           from `c/b/o_t1` left semi join   `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
+POSTHOOK: query: select `c/b/o_t1`.c_int           from `c/b/o_t1` left semi join   `//cbo_t2` on `c/b/o_t1`.key=`//cbo_t2`.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
@@ -16047,16 +16019,12 @@ POSTHOOK: Input: default@cbo_/t3////
  1 	2	1
 1	12	1
 1 	2	1
-PREHOOK: query: -- 1. Test Select + TS
-
-select * from `c/b/o_t1`
+PREHOOK: query: select * from `c/b/o_t1`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. Test Select + TS
-
-select * from `c/b/o_t1`
+POSTHOOK: query: select * from `c/b/o_t1`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
@@ -16181,16 +16149,12 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-PREHOOK: query: -- 2. Test Select + TS + FIL
-
-select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0
+PREHOOK: query: select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. Test Select + TS + FIL
-
-select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0
+POSTHOOK: query: select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
@@ -16297,16 +16261,12 @@ POSTHOOK: Input: default@c/b/o_t1@dt=2014
 1	1	25.0
 1 	1	25.0
 1 	1	25.0
-PREHOOK: query: -- 3 Test Select + Select + TS + FIL
-
-select * from (select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0) as `c/b/o_t1`
+PREHOOK: query: select * from (select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0) as `c/b/o_t1`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3 Test Select + Select + TS + FIL
-
-select * from (select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0) as `c/b/o_t1`
+POSTHOOK: query: select * from (select * from `c/b/o_t1` where `c/b/o_t1`.c_int >= 0) as `c/b/o_t1`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
@@ -16749,15 +16709,11 @@ POSTHOOK: Input: default@c/b/o_t1@dt=2014
 2.0	1	25.0
 2.0	1	25.0
 2.0	1	25.0
-PREHOOK: query: -- 13. null expr in select list
-
-select null from `cbo_/t3////`
+PREHOOK: query: select null from `cbo_/t3////`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_/t3////
 #### A masked pattern was here ####
-POSTHOOK: query: -- 13. null expr in select list
-
-select null from `cbo_/t3////`
+POSTHOOK: query: select null from `cbo_/t3////`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cbo_/t3////
 #### A masked pattern was here ####
@@ -16781,32 +16737,24 @@ NULL
 NULL
 NULL
 NULL
-PREHOOK: query: -- 14. unary operator
-
-select key from `c/b/o_t1` where c_int = -6  or c_int = +6
+PREHOOK: query: select key from `c/b/o_t1` where c_int = -6  or c_int = +6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 14. unary operator
-
-select key from `c/b/o_t1` where c_int = -6  or c_int = +6
+POSTHOOK: query: select key from `c/b/o_t1` where c_int = -6  or c_int = +6
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-PREHOOK: query: -- 15. query referencing only partition columns
-
-select count(`c/b/o_t1`.dt) from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.dt  = `//cbo_t2`.dt  where `c/b/o_t1`.dt = '2014'
+PREHOOK: query: select count(`c/b/o_t1`.dt) from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.dt  = `//cbo_t2`.dt  where `c/b/o_t1`.dt = '2014'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 15. query referencing only partition columns
-
-select count(`c/b/o_t1`.dt) from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.dt  = `//cbo_t2`.dt  where `c/b/o_t1`.dt = '2014'
+POSTHOOK: query: select count(`c/b/o_t1`.dt) from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.dt  = `//cbo_t2`.dt  where `c/b/o_t1`.dt = '2014'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
@@ -16814,27 +16762,19 @@ POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
 400
-PREHOOK: query: -- 20. Test get stats with empty partition list
-
-select `c/b/o_t1`.value from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key = `//cbo_t2`.key where `c/b/o_t1`.dt = '10' and `c/b/o_t1`.c_boolean = true
+PREHOOK: query: select `c/b/o_t1`.value from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key = `//cbo_t2`.key where `c/b/o_t1`.dt = '10' and `c/b/o_t1`.c_boolean = true
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 #### A masked pattern was here ####
-POSTHOOK: query: -- 20. Test get stats with empty partition list
-
-select `c/b/o_t1`.value from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key = `//cbo_t2`.key where `c/b/o_t1`.dt = '10' and `c/b/o_t1`.c_boolean = true
+POSTHOOK: query: select `c/b/o_t1`.value from `c/b/o_t1` join `//cbo_t2` on `c/b/o_t1`.key = `//cbo_t2`.key where `c/b/o_t1`.dt = '10' and `c/b/o_t1`.c_boolean = true
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
 POSTHOOK: Input: default@c/b/o_t1
 #### A masked pattern was here ####
-PREHOOK: query: -- 18. SubQueries Not Exists
-
--- distinct, corr
-
-select * 
+PREHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -16850,11 +16790,7 @@ where not exists
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- 18. SubQueries Not Exists
-
--- distinct, corr
-
-select * 
+POSTHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -16989,9 +16925,7 @@ POSTHOOK: Input: default@src/_/cbo
 199	val_199
 199	val_199
 2	val_2
-PREHOOK: query: -- no agg, corr, having
-
-select * 
+PREHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -17009,9 +16943,7 @@ having not exists
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- no agg, corr, having
-
-select * 
+POSTHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -17043,11 +16975,7 @@ POSTHOOK: Input: default@src/_/cbo
 118	val_118
 119	val_119
 12	val_12
-PREHOOK: query: -- 19. SubQueries Exists
-
--- view test
-
-create view cv1 as 
+PREHOOK: query: create view cv1 as 
 
 select * 
 
@@ -17064,11 +16992,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src/_/cbo
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cv1
-POSTHOOK: query: -- 19. SubQueries Exists
-
--- view test
-
-create view cv1 as 
+POSTHOOK: query: create view cv1 as 
 
 select * 
 
@@ -17106,9 +17030,7 @@ POSTHOOK: Input: default@src/_/cbo
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- sq in from
-
-select * 
+PREHOOK: query: select * 
 
 from (select * 
 
@@ -17126,9 +17048,7 @@ from (select *
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- sq in from
-
-select * 
+POSTHOOK: query: select * 
 
 from (select * 
 
@@ -17157,9 +17077,7 @@ POSTHOOK: Input: default@src/_/cbo
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- sq in from, having
-
-select *
+PREHOOK: query: select *
 
 from (select b.key, count(*) 
 
@@ -17181,9 +17099,7 @@ from (select b.key, count(*)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- sq in from, having
-
-select *
+POSTHOOK: query: select *
 
 from (select b.key, count(*) 
 
@@ -17211,11 +17127,7 @@ POSTHOOK: Input: default@src/_/cbo
 96	1
 97	2
 98	2
-PREHOOK: query: -- 17. SubQueries In
-
--- non agg, non corr
-
-select * 
+PREHOOK: query: select * 
 
 from `src/_/cbo` 
 
@@ -17223,11 +17135,7 @@ where `src/_/cbo`.key in (select key from `src/_/cbo` s1 where s1.key > '9') ord
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- 17. SubQueries In
-
--- non agg, non corr
-
-select * 
+POSTHOOK: query: select * 
 
 from `src/_/cbo` 
 
@@ -17246,15 +17154,7 @@ POSTHOOK: Input: default@src/_/cbo
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- agg, corr
-
--- add back once rank issue fixed for cbo
-
-
-
--- distinct, corr
-
-select * 
+PREHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -17270,15 +17170,7 @@ where b.key in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- agg, corr
-
--- add back once rank issue fixed for cbo
-
-
-
--- distinct, corr
-
-select * 
+POSTHOOK: query: select * 
 
 from `src/_/cbo` b 
 
@@ -17305,9 +17197,7 @@ POSTHOOK: Input: default@src/_/cbo
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- non agg, corr, with join in Parent Query
-
-select p.p_partkey, li.l_suppkey 
+PREHOOK: query: select p.p_partkey, li.l_suppkey 
 
 from (select distinct l_partkey as p_partkey from `line/item`) p join `line/item` li on p.p_partkey = li.l_partkey 
 
@@ -17319,9 +17209,7 @@ where li.l_linenumber = 1 and
 PREHOOK: type: QUERY
 PREHOOK: Input: default@line/item
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, corr, with join in Parent Query
-
-select p.p_partkey, li.l_suppkey 
+POSTHOOK: query: select p.p_partkey, li.l_suppkey 
 
 from (select distinct l_partkey as p_partkey from `line/item`) p join `line/item` li on p.p_partkey = li.l_partkey 
 
@@ -17335,19 +17223,7 @@ POSTHOOK: Input: default@line/item
 #### A masked pattern was here ####
 108570	8571
 4297	1798
-PREHOOK: query: -- where and having
-
--- Plan is:
-
--- Stage 1: b semijoin sq1:`src/_/cbo` (subquery in where)
-
--- Stage 2: group by Stage 1 o/p
-
--- Stage 5: group by on sq2:`src/_/cbo` (subquery in having)
-
--- Stage 6: Stage 2 o/p semijoin Stage 5
-
-select key, value, count(*) 
+PREHOOK: query: select key, value, count(*) 
 
 from `src/_/cbo` b
 
@@ -17359,19 +17235,7 @@ having count(*) in (select count(*) from `src/_/cbo` s1 where s1.key > '9' group
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- where and having
-
--- Plan is:
-
--- Stage 1: b semijoin sq1:`src/_/cbo` (subquery in where)
-
--- Stage 2: group by Stage 1 o/p
-
--- Stage 5: group by on sq2:`src/_/cbo` (subquery in having)
-
--- Stage 6: Stage 2 o/p semijoin Stage 5
-
-select key, value, count(*) 
+POSTHOOK: query: select key, value, count(*) 
 
 from `src/_/cbo` b
 
@@ -17397,9 +17261,7 @@ POSTHOOK: Input: default@src/_/cbo
 96	val_96	1
 97	val_97	2
 98	val_98	2
-PREHOOK: query: -- non agg, non corr, windowing
-
-select p_mfgr, p_name, avg(p_size) 
+PREHOOK: query: select p_mfgr, p_name, avg(p_size) 
 
 from `p/a/r/t` 
 
@@ -17411,9 +17273,7 @@ having p_name in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, non corr, windowing
-
-select p_mfgr, p_name, avg(p_size) 
+POSTHOOK: query: select p_mfgr, p_name, avg(p_size) 
 
 from `p/a/r/t` 
 
@@ -17430,11 +17290,7 @@ Manufacturer#2	almond aquamarine midnight light salmon	2.0
 Manufacturer#3	almond antique misty red olive	1.0
 Manufacturer#4	almond aquamarine yellow dodger mint	7.0
 Manufacturer#5	almond antique sky peru orange	2.0
-PREHOOK: query: -- 16. SubQueries Not In
-
--- non agg, non corr
-
-select * 
+PREHOOK: query: select * 
 
 from `src/_/cbo` 
 
@@ -17448,11 +17304,7 @@ where `src/_/cbo`.key not in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src/_/cbo
 #### A masked pattern was here ####
-POSTHOOK: query: -- 16. SubQueries Not In
-
--- non agg, non corr
-
-select * 
+POSTHOOK: query: select * 
 
 from `src/_/cbo` 
 
@@ -17585,9 +17437,7 @@ POSTHOOK: Input: default@src/_/cbo
 199	val_199
 199	val_199
 2	val_2
-PREHOOK: query: -- non agg, corr
-
-select p_mfgr, b.p_name, p_size 
+PREHOOK: query: select p_mfgr, b.p_name, p_size 
 
 from `p/a/r/t` b 
 
@@ -17603,9 +17453,7 @@ where b.p_name not in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, corr
-
-select p_mfgr, b.p_name, p_size 
+POSTHOOK: query: select p_mfgr, b.p_name, p_size 
 
 from `p/a/r/t` b 
 
@@ -17639,9 +17487,7 @@ Manufacturer#4	almond azure aquamarine papaya violet	12
 Manufacturer#5	almond antique blue firebrick mint	31
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
-PREHOOK: query: -- agg, non corr
-
-select p_name, p_size 
+PREHOOK: query: select p_name, p_size 
 
 from 
 
@@ -17657,9 +17503,7 @@ from
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- agg, non corr
-
-select p_name, p_size 
+POSTHOOK: query: select p_name, p_size 
 
 from 
 
@@ -17701,9 +17545,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
-
-select p_mfgr, p_name, p_size 
+PREHOOK: query: select p_mfgr, p_name, p_size 
 
 from `p/a/r/t` b where b.p_size not in 
 
@@ -17717,9 +17559,7 @@ from `p/a/r/t` b where b.p_size not in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- agg, corr
-
-select p_mfgr, p_name, p_size 
+POSTHOOK: query: select p_mfgr, p_name, p_size 
 
 from `p/a/r/t` b where b.p_size not in 
 
@@ -17753,9 +17593,7 @@ Manufacturer#5	almond antique blue firebrick mint	31
 Manufacturer#5	almond antique medium spring khaki	6
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
-PREHOOK: query: -- non agg, non corr, Group By in Parent Query
-
-select li.l_partkey, count(*) 
+PREHOOK: query: select li.l_partkey, count(*) 
 
 from `line/item` li 
 
@@ -17767,9 +17605,7 @@ group by li.l_partkey order by li.l_partkey
 PREHOOK: type: QUERY
 PREHOOK: Input: default@line/item
 #### 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 `line/item` li 
 
@@ -17797,13 +17633,7 @@ POSTHOOK: Input: default@line/item
 85951	1
 88035	1
 88362	1
-PREHOOK: query: -- add null check test from sq_notin.q once HIVE-7721 resolved.
-
-
-
--- non agg, corr, having
-
-select b.p_mfgr, min(p_retailprice) 
+PREHOOK: query: select b.p_mfgr, min(p_retailprice) 
 
 from `p/a/r/t` b 
 
@@ -17823,13 +17653,7 @@ having b.p_mfgr not in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- add null check test from sq_notin.q once HIVE-7721 resolved.
-
-
-
--- non agg, corr, having
-
-select b.p_mfgr, min(p_retailprice) 
+POSTHOOK: query: select b.p_mfgr, min(p_retailprice) 
 
 from `p/a/r/t` b 
 
@@ -17851,9 +17675,7 @@ POSTHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
 Manufacturer#1	1173.15
 Manufacturer#2	1690.68
-PREHOOK: query: -- agg, non corr, having
-
-select b.p_mfgr, min(p_retailprice) 
+PREHOOK: query: select b.p_mfgr, min(p_retailprice) 
 
 from `p/a/r/t` b 
 
@@ -17875,9 +17697,7 @@ having b.p_mfgr not in
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
-POSTHOOK: query: -- agg, non corr, having
-
-select b.p_mfgr, min(p_retailprice) 
+POSTHOOK: query: select b.p_mfgr, min(p_retailprice) 
 
 from `p/a/r/t` b 
 
@@ -17901,24 +17721,12 @@ POSTHOOK: Input: default@p/a/r/t
 #### A masked pattern was here ####
 Manufacturer#1	1173.15
 Manufacturer#2	1690.68
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-
-
--- 8. Test UDF/UDAF
-
-select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) from `c/b/o_t1`
+PREHOOK: query: select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) from `c/b/o_t1`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-
-
--- 8. Test UDF/UDAF
-
-select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) from `c/b/o_t1`
+POSTHOOK: query: select count(*), count(c_int), sum(c_int), avg(c_int), max(c_int), min(c_int) from `c/b/o_t1`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014
@@ -18032,26 +17840,14 @@ POSTHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
 0	NULL
 1	1.0
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-
-
--- 11. Union All
-
-select * from (select * from `c/b/o_t1` order by key, c_boolean, value, dt)a union all select * from (select * from `//cbo_t2` order by key, c_boolean, value, dt)b
+PREHOOK: query: select * from (select * from `c/b/o_t1` order by key, c_boolean, value, dt)a union all select * from (select * from `//cbo_t2` order by key, c_boolean, value, dt)b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@//cbo_t2
 PREHOOK: Input: default@//cbo_t2@dt=2014
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-
-
--- 11. Union All
-
-select * from (select * from `c/b/o_t1` order by key, c_boolean, value, dt)a union all select * from (select * from `//cbo_t2` order by key, c_boolean, value, dt)b
+POSTHOOK: query: select * from (select * from `c/b/o_t1` order by key, c_boolean, value, dt)a union all select * from (select * from `//cbo_t2` order by key, c_boolean, value, dt)b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@//cbo_t2
 POSTHOOK: Input: default@//cbo_t2@dt=2014
@@ -18958,16 +18754,12 @@ POSTHOOK: Input: default@cbo_/t3////
 3
 3
 3
-PREHOOK: query: -- 10. Test views
-
-create view v1 as select c_int, value, c_boolean, dt from `c/b/o_t1`
+PREHOOK: query: create view v1 as select c_int, value, c_boolean, dt from `c/b/o_t1`
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Output: database:default
 PREHOOK: Output: default@v1
-POSTHOOK: query: -- 10. Test views
-
-create view v1 as select c_int, value, c_boolean, dt from `c/b/o_t1`
+POSTHOOK: query: create view v1 as select c_int, value, c_boolean, dt from `c/b/o_t1`
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Output: database:default
@@ -19213,24 +19005,12 @@ POSTHOOK: query: drop view v4
 POSTHOOK: type: DROPVIEW
 POSTHOOK: Input: default@v4
 POSTHOOK: Output: default@v4
-PREHOOK: query: -- 9. Test Windowing Functions
-
--- SORT_QUERY_RESULTS
-
-
-
-select count(c_int) over() from `c/b/o_t1`
+PREHOOK: query: select count(c_int) over() from `c/b/o_t1`
 PREHOOK: type: QUERY
 PREHOOK: Input: default@c/b/o_t1
 PREHOOK: Input: default@c/b/o_t1@dt=2014
 #### A masked pattern was here ####
-POSTHOOK: query: -- 9. Test Windowing Functions
-
--- SORT_QUERY_RESULTS
-
-
-
-select count(c_int) over() from `c/b/o_t1`
+POSTHOOK: query: select count(c_int) over() from `c/b/o_t1`
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@c/b/o_t1
 POSTHOOK: Input: default@c/b/o_t1@dt=2014

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out b/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
index 561b263..2fba3e2 100644
--- a/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/stats_noscan_1.q.out
@@ -1,14 +1,8 @@
-PREHOOK: query: -- test analyze table ... compute statistics noscan
-
--- 1. test full spec
-create table analyze_srcpart like srcpart
+PREHOOK: query: create table analyze_srcpart like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@analyze_srcpart
-POSTHOOK: query: -- test analyze table ... compute statistics noscan
-
--- 1. test full spec
-create table analyze_srcpart like srcpart
+POSTHOOK: query: create table analyze_srcpart like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@analyze_srcpart
@@ -76,12 +70,10 @@ POSTHOOK: Input: default@analyze_srcpart
 POSTHOOK: Input: default@analyze_srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Output: default@analyze_srcpart
 POSTHOOK: Output: default@analyze_srcpart@ds=2008-04-08/hr=12
-PREHOOK: query: -- confirm result
-describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
+PREHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@analyze_srcpart
-POSTHOOK: query: -- confirm result
-describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
+POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@analyze_srcpart
 # col_name            	data_type           	comment             
@@ -272,13 +264,11 @@ POSTHOOK: query: drop table analyze_srcpart
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@analyze_srcpart
 POSTHOOK: Output: default@analyze_srcpart
-PREHOOK: query: -- 2. test partial spec
-create table analyze_srcpart_partial like srcpart
+PREHOOK: query: create table analyze_srcpart_partial like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@analyze_srcpart_partial
-POSTHOOK: query: -- 2. test partial spec
-create table analyze_srcpart_partial like srcpart
+POSTHOOK: query: create table analyze_srcpart_partial like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@analyze_srcpart_partial
@@ -338,12 +328,10 @@ POSTHOOK: Input: default@analyze_srcpart_partial@ds=2008-04-08/hr=12
 POSTHOOK: Output: default@analyze_srcpart_partial
 POSTHOOK: Output: default@analyze_srcpart_partial@ds=2008-04-08/hr=11
 POSTHOOK: Output: default@analyze_srcpart_partial@ds=2008-04-08/hr=12
-PREHOOK: query: -- confirm result
-describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
+PREHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@analyze_srcpart_partial
-POSTHOOK: query: -- confirm result
-describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
+POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@analyze_srcpart_partial
 # col_name            	data_type           	comment             

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_exists.q.out b/ql/src/test/results/clientpositive/llap/subquery_exists.q.out
index 3d8251f..35c64e7 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_exists.q.out
@@ -1,8 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- no agg, corr
--- SORT_QUERY_RESULTS
-explain
+PREHOOK: query: explain
 select * 
 from src b 
 where exists 
@@ -11,11 +7,7 @@ where exists
   where b.value = a.value  and a.key = b.key and a.value > 'val_9'
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- no agg, corr
--- SORT_QUERY_RESULTS
-explain
+POSTHOOK: query: explain
 select * 
 from src b 
 where exists 
@@ -194,8 +186,7 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- view test
-create view cv1 as 
+PREHOOK: query: create view cv1 as 
 select * 
 from src b 
 where exists
@@ -206,8 +197,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@cv1
-POSTHOOK: query: -- view test
-create view cv1 as 
+POSTHOOK: query: create view cv1 as 
 select * 
 from src b 
 where exists
@@ -239,8 +229,7 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- sq in from
-select * 
+PREHOOK: query: select * 
 from (select * 
       from src b 
       where exists 
@@ -251,8 +240,7 @@ from (select *
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- sq in from
-select * 
+POSTHOOK: query: select * 
 from (select * 
       from src b 
       where exists 
@@ -274,8 +262,7 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- upper case in subq
-explain
+PREHOOK: query: explain
 select *
 from src b
 where exists
@@ -284,8 +271,7 @@ where exists
   where b.VALUE = a.VALUE
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- upper case in subq
-explain
+POSTHOOK: query: explain
 select *
 from src b
 where exists
@@ -432,8 +418,7 @@ STAGE PLANS:
         ListSink
 
 Warning: Shuffle Join MERGEJOIN[16][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- uncorr exists
-explain
+PREHOOK: query: explain
 select *
 from src b
 where exists
@@ -442,8 +427,7 @@ where exists
   where a.value > 'val_9'
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- uncorr exists
-explain
+POSTHOOK: query: explain
 select *
 from src b
 where exists

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_in.q.out b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
index 887a27e..95c13e6 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
@@ -1,15 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- non agg, non corr
-explain
+PREHOOK: query: explain
  select * 
 from src 
 where src.key in (select key from src s1 where s1.key > '9')
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- non agg, non corr
-explain
+POSTHOOK: query: explain
  select * 
 from src 
 where src.key in (select key from src s1 where s1.key > '9')
@@ -125,8 +119,7 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- non agg, corr
-explain 
+PREHOOK: query: explain 
 select * 
 from src b 
 where b.key in
@@ -135,8 +128,7 @@ where b.key in
          where b.value = a.value and a.key > '9'
         )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- non agg, corr
-explain 
+POSTHOOK: query: explain 
 select * 
 from src b 
 where b.key in
@@ -316,8 +308,7 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- agg, non corr
-explain
+PREHOOK: query: explain
 select p_name, p_size 
 from 
 part where part.p_size in 
@@ -326,8 +317,7 @@ part where part.p_size 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 in 
@@ -503,8 +493,7 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 almond antique medium spring khaki	6
 almond antique salmon chartreuse burlywood	6
-PREHOOK: query: -- agg, corr
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size 
 from part b where b.p_size in 
 	(select min(p_size) 
@@ -512,8 +501,7 @@ from part b where b.p_size 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 in 
 	(select min(p_size) 
@@ -755,8 +743,7 @@ Manufacturer#2	almond aquamarine midnight light salmon	2
 Manufacturer#3	almond antique misty red olive	1
 Manufacturer#4	almond aquamarine yellow dodger mint	7
 Manufacturer#5	almond antique sky peru orange	2
-PREHOOK: query: -- distinct, corr
-explain 
+PREHOOK: query: explain 
 select * 
 from src b 
 where b.key in
@@ -765,8 +752,7 @@ where b.key in
          where b.value = a.value and a.key > '9'
         )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- distinct, corr
-explain 
+POSTHOOK: query: explain 
 select * 
 from src b 
 where b.key in
@@ -951,16 +937,14 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
-PREHOOK: query: -- non agg, non corr, windowing
-select p_mfgr, p_name, p_size 
+PREHOOK: query: select p_mfgr, p_name, p_size 
 from part 
 where part.p_size in 
   (select first_value(p_size) over(partition by p_mfgr order by p_size) from part)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, non corr, windowing
-select p_mfgr, p_name, p_size 
+POSTHOOK: query: select p_mfgr, p_name, p_size 
 from part 
 where part.p_size in 
   (select first_value(p_size) over(partition by p_mfgr order by p_size) from part)
@@ -973,15 +957,13 @@ Manufacturer#2	almond aquamarine midnight light salmon	2
 Manufacturer#3	almond antique misty red olive	1
 Manufacturer#4	almond aquamarine yellow dodger mint	7
 Manufacturer#5	almond antique sky peru orange	2
-PREHOOK: query: -- non agg, non corr, with join in Parent Query
-explain
+PREHOOK: query: explain
 select p.p_partkey, li.l_suppkey 
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey 
 where li.l_linenumber = 1 and
  li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR')
 PREHOOK: type: QUERY
-POSTHOOK: query: -- non agg, non corr, with join in Parent Query
-explain
+POSTHOOK: query: explain
 select p.p_partkey, li.l_suppkey 
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey 
 where li.l_linenumber = 1 and
@@ -1162,16 +1144,14 @@ POSTHOOK: Input: default@lineitem
 61336	8855
 64128	9141
 82704	7721
-PREHOOK: query: -- non agg, corr, with join in Parent Query
-select p.p_partkey, li.l_suppkey 
+PREHOOK: query: select p.p_partkey, li.l_suppkey 
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey 
 where li.l_linenumber = 1 and
  li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' and l_linenumber = li.l_linenumber)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@lineitem
 #### A masked pattern was here ####
-POSTHOOK: query: -- non agg, corr, with join in Parent Query
-select p.p_partkey, li.l_suppkey 
+POSTHOOK: query: select p.p_partkey, li.l_suppkey 
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey 
 where li.l_linenumber = 1 and
  li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' and l_linenumber = li.l_linenumber)
@@ -1181,11 +1161,9 @@ POSTHOOK: Input: default@lineitem
 108570	8571
 4297	1798
 Warning: Shuffle Join MERGEJOIN[60][tables = [$hdt$_3, $hdt$_4]] in Stage 'Reducer 11' is a cross product
-PREHOOK: query: -- corr, agg in outer and inner
-explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey)
+PREHOOK: query: explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- corr, agg in outer and inner
-explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey)
+POSTHOOK: query: explain select sum(l_extendedprice) from lineitem, part where p_partkey = l_partkey and l_quantity IN (select avg(l_quantity) from lineitem where l_partkey = p_partkey)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1453,11 +1431,9 @@ POSTHOOK: Input: default@lineitem
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 NULL
-PREHOOK: query: --where has multiple conjuction
-explain select * from part where p_brand <> 'Brand#14' AND p_size 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 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 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 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
@@ -1665,11 +1641,9 @@ POSTHOOK: Input: default@part
 85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
 90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
-PREHOOK: query: --lhs contains non-simple expression
-explain select * from part  where (p_size-1) IN (select min(p_size) from part group by p_type)
+PREHOOK: query: explain select * from part  where (p_size-1) 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) IN (select min(p_size) from part group by p_type)
+POSTHOOK: query: explain select * from part  where (p_size-1) IN (select min(p_size) from part group by p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1932,11 +1906,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 40982	almond antique misty red olive	Manufacturer#3	Brand#32	ECONOMY PLATED COPPER	1	LG PKG	1922.98	c foxes can s
-PREHOOK: query: --lhs contains non-simple expression, corr
-explain select count(*) as c from part as e where p_size + 100 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 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 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 IN (select p_partkey from part where p_name = e.p_name)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2109,11 +2081,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 0
-PREHOOK: query: -- lhs contains udf expression
-explain select * from part  where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type)
+PREHOOK: query: explain select * from part  where floor(p_retailprice) 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) IN (select floor(min(p_retailprice)) from part group by p_type)
+POSTHOOK: query: explain select * from part  where floor(p_retailprice) IN (select floor(min(p_retailprice)) from part group by p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2419,11 +2389,9 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
 121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
-PREHOOK: query: -- correlated query, multiple correlated variables referring to different outer var
-explain select * from part where p_name 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 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 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 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
@@ -2605,11 +2573,9 @@ POSTHOOK: Input: default@part
 85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
 90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
-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 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 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 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 IN (select p_type from part where part.p_brand = fpart.brand)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2783,11 +2749,9 @@ almond aquamarine sandy cyan gainsboro
 almond aquamarine yellow dodger mint
 almond azure aquamarine papaya violet
 almond azure blanched chiffon midnight
-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 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 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 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 IN (select p_type from part where (part.p_size+1) = fpart.size)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2965,11 +2929,9 @@ almond aquamarine sandy cyan gainsboro
 almond aquamarine yellow dodger mint
 almond azure aquamarine papaya violet
 almond azure blanched chiffon midnight
-PREHOOK: query: -- where plus having
-explain select key, count(*) from src where value 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 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 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 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
@@ -3197,11 +3159,9 @@ POSTHOOK: Input: default@src
 5	3
 70	3
 90	3
-PREHOOK: query: -- where with having, correlated
-explain select key, count(*) from src where value 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 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 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 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
@@ -3495,11 +3455,9 @@ POSTHOOK: Input: default@src
 5	3
 70	3
 90	3
-PREHOOK: query: -- subquery with order by
-explain select * from part  where (p_size-1) 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) 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) 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) 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
@@ -3647,11 +3605,9 @@ POSTHOOK: Input: default@part
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
-PREHOOK: query: --order by with limit
-explain select * from part  where (p_size-1) 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) 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) 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) 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
@@ -3797,11 +3753,9 @@ POSTHOOK: Input: default@part
 121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
-PREHOOK: query: -- union, uncorr
-explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part)
+PREHOOK: query: explain select * from src where key 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 IN (select p_name from part UNION ALL select p_brand from part)
+POSTHOOK: query: explain select * from src where key IN (select p_name from part UNION ALL select p_brand from part)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -3927,12 +3881,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-PREHOOK: query: -- corr, subquery has another subquery in from
-explain select p_mfgr, b.p_name, p_size from part b where b.p_name in 
+PREHOOK: query: explain select p_mfgr, b.p_name, p_size from part b where b.p_name in 
   (select p_name from (select p_mfgr, p_name, p_size as r from part) a where r < 10 and b.p_mfgr = a.p_mfgr ) order by p_mfgr,p_size
 PREHOOK: type: QUERY
-POSTHOOK: query: -- corr, subquery has another subquery in from
-explain select p_mfgr, b.p_name, p_size from part b where b.p_name in 
+POSTHOOK: query: explain select p_mfgr, b.p_name, p_size from part b where b.p_name in 
   (select p_name from (select p_mfgr, p_name, p_size as r from part) a where r < 10 and b.p_mfgr = a.p_mfgr ) order by p_mfgr,p_size
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -4119,11 +4071,9 @@ Manufacturer#3	almond antique misty red olive	1
 Manufacturer#4	almond aquamarine yellow dodger mint	7
 Manufacturer#5	almond antique medium spring khaki	6
 Manufacturer#5	almond antique sky peru orange	2
-PREHOOK: query: -- join in subquery, correlated predicate with only one table
-explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)
+PREHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- join in subquery, correlated predicate with only one table
-explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)
+POSTHOOK: query: explain select p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4342,12 +4292,10 @@ POSTHOOK: Input: default@part
 85768
 86428
 90681
-PREHOOK: query: -- join in subquery, correlated predicate with both inner tables, same outer var
-explain select p_partkey from part where p_name in 
+PREHOOK: query: explain select p_partkey from part where p_name in 
 	(select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_size=part.p_size)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- join in subquery, correlated predicate with both inner tables, same outer var
-explain select p_partkey from part where p_name in 
+POSTHOOK: query: explain select p_partkey from part where p_name in 
 	(select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_size=part.p_size)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -4618,12 +4566,10 @@ POSTHOOK: Input: default@part
 85768
 86428
 90681
-PREHOOK: query: -- join in subquery, correlated predicate with both inner tables, different outer var
-explain select p_partkey from part where p_name in 
+PREHOOK: query: explain select p_partkey from part where p_name in 
 	(select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_type=part.p_type)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- join in subquery, correlated predicate with both inner tables, different outer var
-explain select p_partkey from part where p_name in 
+POSTHOOK: query: explain select p_partkey from part where p_name in 
 	(select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size and p.p_type=part.p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -4851,12 +4797,10 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- subquery within from 
-explain select p_partkey from 
+PREHOOK: query: explain select p_partkey from 
 	(select p_size, p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)) subq
 PREHOOK: type: QUERY
-POSTHOOK: query: -- subquery within from 
-explain select p_partkey from 
+POSTHOOK: query: explain select p_partkey from 
 	(select p_size, p_partkey from part where p_name in (select p.p_name from part p left outer join part pp on p.p_type = pp.p_type where pp.p_size = part.p_size)) subq
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -5101,49 +5045,41 @@ POSTHOOK: query: insert into tnull values(NULL) , (NULL)
 POSTHOOK: type: QUERY
 POSTHOOK: Output: default@tnull
 POSTHOOK: Lineage: tnull.i EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
-PREHOOK: query: -- empty inner table, non-null sq key, expected empty result
-select * from part where p_size IN (select i from tempty)
+PREHOOK: query: select * from part where p_size IN (select i from tempty)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 PREHOOK: Input: default@tempty
 #### A masked pattern was here ####
-POSTHOOK: query: -- empty inner table, non-null sq key, expected empty result
-select * from part where p_size IN (select i from tempty)
+POSTHOOK: query: select * from part where p_size IN (select i from tempty)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 POSTHOOK: Input: default@tempty
 #### A masked pattern was here ####
-PREHOOK: query: -- empty inner table, null sq key, expected empty result
-select * from tnull where i IN (select i from tempty)
+PREHOOK: query: select * from tnull where i IN (select i from tempty)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tempty
 PREHOOK: Input: default@tnull
 #### A masked pattern was here ####
-POSTHOOK: query: -- empty inner table, null sq key, expected empty result
-select * from tnull where i IN (select i from tempty)
+POSTHOOK: query: select * from tnull where i IN (select i from tempty)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tempty
 POSTHOOK: Input: default@tnull
 #### A masked pattern was here ####
-PREHOOK: query: -- null inner table, non-null sq key
-select * from part where p_size IN (select i from tnull)
+PREHOOK: query: select * from part where p_size IN (select i from tnull)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 PREHOOK: Input: default@tnull
 #### A masked pattern was here ####
-POSTHOOK: query: -- null inner table, non-null sq key
-select * from part where p_size IN (select i from tnull)
+POSTHOOK: query: select * from part where p_size IN (select i from tnull)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 POSTHOOK: Input: default@tnull
 #### A masked pattern was here ####
-PREHOOK: query: -- null inner table, null sq key
-select * from tnull where i IN (select i from tnull)
+PREHOOK: query: select * from tnull where i IN (select i from tnull)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tnull
 #### A masked pattern was here ####
-POSTHOOK: query: -- null inner table, null sq key
-select * from tnull where i IN (select i from tnull)
+POSTHOOK: query: select * from tnull where i IN (select i from tnull)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tnull
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
index 7765221..536bfdb 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
@@ -75,15 +75,9 @@ POSTHOOK: Lineage: part_null.p_partkey EXPRESSION [(values__tmp__table__2)values
 POSTHOOK: Lineage: part_null.p_retailprice EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col8, type:string, comment:), ]
 POSTHOOK: Lineage: part_null.p_size EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col6, type:string, comment:), ]
 POSTHOOK: Lineage: part_null.p_type SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col5, type:string, comment:), ]
-PREHOOK: query: -- multiple subquery
-
--- Both IN are always true so should return all rows
-explain select * from part_null where p_size IN (select p_size from part_null) AND p_brand IN (select p_brand from part_null)
+PREHOOK: query: explain select * from part_null where p_size IN (select p_size from part_null) AND p_brand IN (select p_brand from part_null)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- multiple subquery
-
--- Both IN are always true so should return all rows
-explain select * from part_null where p_size IN (select p_size from part_null) AND p_brand IN (select p_brand from part_null)
+POSTHOOK: query: explain select * from part_null where p_size IN (select p_size from part_null) AND p_brand IN (select p_brand from part_null)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -255,11 +249,9 @@ POSTHOOK: Input: default@part_null
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
 Warning: Shuffle Join MERGEJOIN[40][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- NOT IN has null value so should return 0 rows
-explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_name from part_null)
+PREHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_name from part_null)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- NOT IN has null value so should return 0 rows
-explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_name from part_null)
+POSTHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_name from part_null)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -466,11 +458,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part_null
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[40][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- NOT IN is always true and IN is false for where p_name is NULL, hence should return all but one row
-explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_type from part_null)
+PREHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_type from part_null)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- NOT IN is always true and IN is false for where p_name is NULL, hence should return all but one row
-explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_type from part_null)
+POSTHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND p_brand NOT IN (select p_type from part_null)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -703,11 +693,9 @@ POSTHOOK: Input: default@part_null
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
 Warning: Shuffle Join MERGEJOIN[40][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- NOT IN has one NULL value so this whole query should not return any row
-explain select * from part_null where p_brand IN (select p_brand from part_null) AND p_brand NOT IN (select p_name from part_null)
+PREHOOK: query: explain select * from part_null where p_brand IN (select p_brand from part_null) AND p_brand NOT IN (select p_name from part_null)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- NOT IN has one NULL value so this whole query should not return any row
-explain select * from part_null where p_brand IN (select p_brand from part_null) AND p_brand NOT IN (select p_name from part_null)
+POSTHOOK: query: explain select * from part_null where p_brand IN (select p_brand from part_null) AND p_brand NOT IN (select p_name from part_null)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -914,13 +902,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part_null
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[42][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- NOT IN is always true irrespective of p_name being null/non-null since inner query is empty
--- second query is always true so this should return all rows
-explain select * from part_null where p_name NOT IN (select c from tempty) AND p_brand IN (select p_brand from part_null)
+PREHOOK: query: explain select * from part_null where p_name NOT IN (select c from tempty) AND p_brand IN (select p_brand from part_null)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- NOT IN is always true irrespective of p_name being null/non-null since inner query is empty
--- second query is always true so this should return all rows
-explain select * from part_null where p_name NOT IN (select c from tempty) AND p_brand IN (select p_brand from part_null)
+POSTHOOK: query: explain select * from part_null where p_name NOT IN (select c from tempty) AND p_brand IN (select p_brand from part_null)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1156,11 +1140,9 @@ POSTHOOK: Input: default@tempty
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 Warning: Shuffle Join MERGEJOIN[28][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- IN, EXISTS
-explain select * from part_null where p_name IN (select p_name from part_null) AND EXISTS (select c from tnull)
+PREHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND EXISTS (select c from tnull)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- IN, EXISTS
-explain select * from part_null where p_name IN (select p_name from part_null) AND EXISTS (select c from tnull)
+POSTHOOK: query: explain select * from part_null where p_name IN (select p_name from part_null) AND EXISTS (select c from tnull)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1667,11 +1649,9 @@ POSTHOOK: Input: default@tempty
 78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
 Warning: Shuffle Join MERGEJOIN[187][tables = [$hdt$_4, $hdt$_5]] in Stage 'Reducer 18' is a cross product
 Warning: Shuffle Join MERGEJOIN[190][tables = [$hdt$_4, $hdt$_5]] in Stage 'Reducer 23' is a cross product
-PREHOOK: query: -- corr, mix of IN/NOT IN
-explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+PREHOOK: query: explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- corr, mix of IN/NOT IN
-explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+POSTHOOK: query: explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2460,11 +2440,9 @@ POSTHOOK: Input: default@part_null
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
-PREHOOK: query: -- mix of corr and uncorr
-explain select * from part_null where p_name IN ( select p_name from part) AND p_brand IN (select p_brand from part where part.p_type = part_null.p_type)
+PREHOOK: query: explain select * from part_null where p_name IN ( select p_name from part) AND p_brand IN (select p_brand from part where part.p_type = part_null.p_type)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- mix of corr and uncorr
-explain select * from part_null where p_name IN ( select p_name from part) AND p_brand IN (select p_brand from part where part.p_type = part_null.p_type)
+POSTHOOK: query: explain select * from part_null where p_name IN ( select p_name from part) AND p_brand IN (select p_brand from part where part.p_type = part_null.p_type)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2756,11 +2734,9 @@ POSTHOOK: Input: default@part_null
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 Warning: Shuffle Join MERGEJOIN[187][tables = [$hdt$_4, $hdt$_5]] in Stage 'Reducer 18' is a cross product
 Warning: Shuffle Join MERGEJOIN[190][tables = [$hdt$_4, $hdt$_5]] in Stage 'Reducer 23' is a cross product
-PREHOOK: query: -- one query has multiple corr
-explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type AND part.p_container=part_null.p_container) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+PREHOOK: query: explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type AND part.p_container=part_null.p_container) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- one query has multiple corr
-explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type AND part.p_container=part_null.p_container) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+POSTHOOK: query: explain select * from part_null where p_name IN ( select p_name from part where part.p_type = part_null.p_type AND part.p_container=part_null.p_container) AND p_brand NOT IN (select p_container from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -3549,11 +3525,9 @@ POSTHOOK: Input: default@part_null
 42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
 144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
-PREHOOK: query: --diff corr var (all reffering to diff outer var)
-explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_type from part where part.p_size = part_null.p_size)
+PREHOOK: query: explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_type from part where part.p_size = part_null.p_size)
 PREHOOK: type: QUERY
-POSTHOOK: query: --diff corr var (all reffering to diff outer var)
-explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_type from part where part.p_size = part_null.p_size)
+POSTHOOK: query: explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type) AND p_brand NOT IN (select p_type from part where part.p_size = part_null.p_size)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4002,13 +3976,9 @@ POSTHOOK: Input: default@part_null
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
-PREHOOK: query: -- NESTED QUERIES
--- both queries are correlated
-explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+PREHOOK: query: explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- NESTED QUERIES
--- both queries are correlated
-explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
+POSTHOOK: query: explain select * from part_null where p_name IN (select p_name from part where part.p_type = part_null.p_type AND p_brand IN (select p_brand from part pp where part.p_type = pp.p_type))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -4295,14 +4265,12 @@ POSTHOOK: Input: default@part_null
 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
 Warning: Shuffle Join MERGEJOIN[100][tables = [$hdt$_2, $hdt$_3, $hdt$_4]] in Stage 'Reducer 8' is a cross product
-PREHOOK: query: -- in, not in corr
-explain select p.p_partkey, li.l_suppkey
+PREHOOK: query: explain select p.p_partkey, li.l_suppkey
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey
 where li.l_linenumber = 1 and
  li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' and l_linenumber = li.l_linenumber AND l_quantity NOT IN (select avg(l_quantity) from lineitem))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- in, not in corr
-explain select p.p_partkey, li.l_suppkey
+POSTHOOK: query: explain select p.p_partkey, li.l_suppkey
 from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey
 where li.l_linenumber = 1 and
  li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' and l_linenumber = li.l_linenumber AND l_quantity NOT IN (select avg(l_quantity) from lineitem))
@@ -5405,11 +5373,9 @@ POSTHOOK: Input: default@src
 430	val_430	3
 417	val_417	3
 Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_1, $hdt$_2]] in Stage 'Reducer 4' is a cross product
-PREHOOK: query: -- subquery pred only refer to parent query column
-explain select * from part where p_name IN (select p_name from part p where part.p_type <> '1')
+PREHOOK: query: explain select * from part where p_name IN (select p_name from part p where part.p_type <> '1')
 PREHOOK: type: QUERY
-POSTHOOK: query: -- subquery pred only refer to parent query column
-explain select * from part where p_name IN (select p_name from part p where part.p_type <> '1')
+POSTHOOK: query: explain select * from part where p_name IN (select p_name from part p where part.p_type <> '1')
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage