http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf.q.out 
b/ql/src/test/results/clientpositive/llap/ptf.q.out
index c97f1ce..24516fc 100644
--- a/ql/src/test/results/clientpositive/llap/ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf.q.out
@@ -1,7 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
---1. test1
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -11,10 +8,7 @@ from noop(on part
   order by p_name
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
---1. test1
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -184,16 +178,14 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.35
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 2. testJoinWithNoop
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = 
p2.p_partkey) j
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2. testJoinWithNoop
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = 
p2.p_partkey) j
@@ -379,15 +371,13 @@ Manufacturer#5    almond antique medium spring khaki      
6       -25
 Manufacturer#5 almond antique sky peru orange  2       -4
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      -23
-PREHOOK: query: -- 3. testOnlyPTF
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3. testOnlyPTF
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
@@ -497,8 +487,7 @@ Manufacturer#5      almond antique medium spring khaki      
6
 Manufacturer#5 almond antique sky peru orange  2
 Manufacturer#5 almond aquamarine dodger light gainsboro        46
 Manufacturer#5 almond azure blanched chiffon midnight  23
-PREHOOK: query: -- 4. testPTFAlias
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -508,8 +497,7 @@ from noop(on part
   order by p_name
   ) abc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 4. testPTFAlias
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -679,8 +667,7 @@ Manufacturer#5      almond antique medium spring khaki      
6       2       2       3401.35
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 5. testPTFAndWhereWithWindowing
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -690,8 +677,7 @@ from noop(on part
           order by p_name 
           )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 5. testPTFAndWhereWithWindowing
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -862,8 +848,7 @@ Manufacturer#5      almond antique medium spring khaki      
6       2       2       6       -25
 Manufacturer#5 almond antique sky peru orange  2       3       3       2       
-4
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
23      -23
-PREHOOK: query: -- 6. testSWQAndPTFAndGBy
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -874,8 +859,7 @@ from noop(on part
           ) 
 group by p_mfgr, p_name, p_size
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 6. testSWQAndPTFAndGBy
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1057,16 +1041,14 @@ Manufacturer#5  almond antique medium spring khaki      
6       2       2       6       -25
 Manufacturer#5 almond antique sky peru orange  2       3       3       2       
-4
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
23      -23
-PREHOOK: query: -- 7. testJoin
-explain
+PREHOOK: query: explain
 select abc.* 
 from noop(on part 
 partition by p_mfgr 
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 7. testJoin
-explain
+POSTHOOK: query: explain
 select abc.* 
 from noop(on part 
 partition by p_mfgr 
@@ -1213,16 +1195,14 @@ 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: -- 8. testJoinRight
-explain
+PREHOOK: query: explain
 select abc.* 
 from part p1 join noop(on part 
 partition by p_mfgr 
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 8. testJoinRight
-explain
+POSTHOOK: query: explain
 select abc.* 
 from part p1 join noop(on part 
 partition by p_mfgr 
@@ -1373,16 +1353,14 @@ 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: -- 9. testNoopWithMap
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 9. testNoopWithMap
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part
@@ -1545,8 +1523,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2
 Manufacturer#5 almond antique sky peru orange  2       3
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4
 Manufacturer#5 almond azure blanched chiffon midnight  23      5
-PREHOOK: query: -- 10. testNoopWithMapWithWindowing 
-explain 
+PREHOOK: query: explain 
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -1555,8 +1532,7 @@ from noopwithmap(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 10. testNoopWithMapWithWindowing 
-explain 
+POSTHOOK: query: explain 
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -1740,8 +1716,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.35
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -1750,8 +1725,7 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -1918,8 +1892,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.35
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 12. testFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1929,8 +1902,7 @@ partition by p_mfgr
 order by p_mfgr DESC, p_name
 )))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 12. testFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -2159,8 +2131,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.35
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 13. testPTFAndWindowingInSubQ
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
@@ -2173,8 +2144,7 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 13. testPTFAndWindowingInSubQ
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
@@ -2345,8 +2315,7 @@ Manufacturer#5    almond antique medium spring khaki      
2       6208.18
 Manufacturer#5 almond antique sky peru orange  3       7672.66
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       5882.97
 Manufacturer#5 almond azure blanched chiffon midnight  5       4271.31
-PREHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-explain
+PREHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -2358,8 +2327,7 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-explain
+POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -2586,15 +2554,13 @@ Manufacturer#5  almond antique medium spring khaki      
2       2       2       1611.66 3401.35 6       -25
 Manufacturer#5 almond antique sky peru orange  3       3       3       1788.73 
5190.08 2       -4
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       4       
4       1018.1  6208.18 46      44
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       5       
1464.48 7672.66 23      -23
-PREHOOK: query: -- 15. testDistinctInSelectWithPTF
-explain
+PREHOOK: query: explain
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
 order by p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 15. testDistinctInSelectWithPTF
-explain
+POSTHOOK: query: explain
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
@@ -2722,8 +2688,7 @@ Manufacturer#5    almond antique medium spring khaki      
6
 Manufacturer#5 almond antique sky peru orange  2
 Manufacturer#5 almond aquamarine dodger light gainsboro        46
 Manufacturer#5 almond azure blanched chiffon midnight  23
-PREHOOK: query: -- 16. testViewAsTableInputToPTF
-create view IF NOT EXISTS mfgr_price_view as 
+PREHOOK: query: create view IF NOT EXISTS mfgr_price_view as 
 select p_mfgr, p_brand, 
 round(sum(p_retailprice),2) as s
 from part 
@@ -2732,8 +2697,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@part
 PREHOOK: Output: database:default
 PREHOOK: Output: default@mfgr_price_view
-POSTHOOK: query: -- 16. testViewAsTableInputToPTF
-create view IF NOT EXISTS mfgr_price_view as 
+POSTHOOK: query: create view IF NOT EXISTS mfgr_price_view as 
 select p_mfgr, p_brand, 
 round(sum(p_retailprice),2) as s
 from part 
@@ -2908,8 +2872,7 @@ Manufacturer#4    Brand#42        2581.68 7337.62
 Manufacturer#5 Brand#51        1611.66 1611.66
 Manufacturer#5 Brand#52        3254.17 4865.83
 Manufacturer#5 Brand#53        2806.83 7672.66
-PREHOOK: query: -- 17. testMultipleInserts2SWQsWithPTF
-CREATE TABLE part_4( 
+PREHOOK: query: CREATE TABLE part_4( 
 p_mfgr STRING, 
 p_name STRING, 
 p_size INT, 
@@ -2919,8 +2882,7 @@ s DOUBLE)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_4
-POSTHOOK: query: -- 17. testMultipleInserts2SWQsWithPTF
-CREATE TABLE part_4( 
+POSTHOOK: query: CREATE TABLE part_4( 
 p_mfgr STRING, 
 p_name STRING, 
 p_size INT, 
@@ -3349,8 +3311,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       8       2       2       0.4     31
 Manufacturer#5 almond antique sky peru orange  2       2       3       3       
0.6     31
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      46      
4       4       0.8     6
 Manufacturer#5 almond azure blanched chiffon midnight  23      23      5       
5       1.0     2
-PREHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -3367,8 +3328,7 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -3625,8 +3585,7 @@ Manufacturer#5    almond antique medium spring khaki      
1       1       6       6
 Manufacturer#5 almond antique sky peru orange  1       1       2       2
 Manufacturer#5 almond aquamarine dodger light gainsboro        1       1       
46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23
-PREHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -3643,8 +3602,7 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -3898,8 +3856,7 @@ Manufacturer#5    almond antique medium spring khaki      
2       2       6       37
 Manufacturer#5 almond antique sky peru orange  3       3       2       39
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       4       
46      85
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       23      
108
-PREHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -3914,8 +3871,7 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -4142,8 +4098,7 @@ Manufacturer#5    almond antique medium spring khaki      
2       2       6       37
 Manufacturer#5 almond antique sky peru orange  3       3       2       39
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       4       
46      85
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       23      
108
-PREHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -4160,8 +4115,7 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -4432,8 +4386,7 @@ Manufacturer#5    almond antique medium spring khaki      
1       1       6       6
 Manufacturer#5 almond antique sky peru orange  1       1       2       2
 Manufacturer#5 almond aquamarine dodger light gainsboro        1       1       
46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23
-PREHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
@@ -4449,8 +4402,7 @@ from noop(on
           order by p_mfgr
           ))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
@@ -4697,8 +4649,7 @@ Manufacturer#5    almond antique medium spring khaki      
1       1       6       6       6
 Manufacturer#5 almond antique sky peru orange  1       1       2       2       
2
 Manufacturer#5 almond aquamarine dodger light gainsboro        1       1       
46      46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23      23
-PREHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -4712,8 +4663,7 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
index b45e5ed..6c60f98 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
@@ -34,10 +34,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
'../../data/files/flights_tiny.txt' OVER
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@flights_tiny
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- 1. basic Matchpath test
-explain
+PREHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -48,10 +45,7 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath') 
    )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- 1. basic Matchpath test
-explain
+POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -168,8 +162,7 @@ Chicago     897     2010    10      20      4       20
 Chicago        897     2010    10      21      3       21
 Chicago        897     2010    10      22      2       22
 Washington     7291    2010    10      27      2       27
-PREHOOK: query: -- 2. Matchpath on 1 partition
-explain
+PREHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -180,8 +173,7 @@ from matchpath(on
    )
 where fl_num = 1142
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2. Matchpath on 1 partition
-explain
+POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -290,8 +282,7 @@ Baltimore   1142    2010    10      21      5       21
 Baltimore      1142    2010    10      22      4       22
 Baltimore      1142    2010    10      25      3       25
 Baltimore      1142    2010    10      26      2       26
-PREHOOK: query: -- 3. empty partition.
-explain
+PREHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
 from matchpath(on
         (select * from flights_tiny where fl_num = -1142) flights_tiny
@@ -301,8 +292,7 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath')
    )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3. empty partition.
-explain
+POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
 from matchpath(on
         (select * from flights_tiny where fl_num = -1142) flights_tiny

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
index d410f5d..6013c11 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
@@ -1,7 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
---1. test1
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -11,10 +8,7 @@ from noopstreaming(on part
   order by p_name
   )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
---1. test1
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -184,16 +178,14 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.3500000000004
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 2. testJoinWithNoop
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noopstreaming (on (select p1.* from part p1 join part p2 on p1.p_partkey 
= p2.p_partkey) j
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2. testJoinWithNoop
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
 from noopstreaming (on (select p1.* from part p1 join part p2 on p1.p_partkey 
= p2.p_partkey) j
@@ -379,16 +371,14 @@ Manufacturer#5    almond antique medium spring khaki      
6       -25
 Manufacturer#5 almond antique sky peru orange  2       -4
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      44
 Manufacturer#5 almond azure blanched chiffon midnight  23      -23
-PREHOOK: query: -- 7. testJoin
-explain 
+PREHOOK: query: explain 
 select abc.* 
 from noopstreaming(on part 
 partition by p_mfgr 
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 7. testJoin
-explain 
+POSTHOOK: query: explain 
 select abc.* 
 from noopstreaming(on part 
 partition by p_mfgr 
@@ -535,16 +525,14 @@ 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: -- 9. testNoopWithMap
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmapstreaming(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 9. testNoopWithMap
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmapstreaming(on part
@@ -707,8 +695,7 @@ Manufacturer#5      almond antique medium spring khaki      
6       2
 Manufacturer#5 almond antique sky peru orange  2       3
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4
 Manufacturer#5 almond azure blanched chiffon midnight  23      5
-PREHOOK: query: -- 10. testNoopWithMapWithWindowing 
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -717,8 +704,7 @@ from noopwithmapstreaming(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 10. testNoopWithMapWithWindowing 
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
@@ -902,8 +888,7 @@ Manufacturer#5      almond antique medium spring khaki      
6       2       2       3401.3500000000004
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 12. testFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -913,8 +898,7 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 12. testFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1143,8 +1127,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.3500000000004
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 12.1 testFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1154,8 +1137,7 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 12.1 testFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1384,8 +1366,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.3500000000004
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 12.2 testFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1395,8 +1376,7 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 12.2 testFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -1625,8 +1605,7 @@ Manufacturer#5    almond antique medium spring khaki      
6       2       2       3401.3500000000004
 Manufacturer#5 almond antique sky peru orange  2       3       3       5190.08
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      4       
4       6208.18
 Manufacturer#5 almond azure blanched chiffon midnight  23      5       5       
7672.66
-PREHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-explain
+PREHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -1638,8 +1617,7 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-explain
+POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
@@ -1866,8 +1844,7 @@ Manufacturer#5    almond antique medium spring khaki      
2       2       2       1611.66 3401.35000000000
 Manufacturer#5 almond antique sky peru orange  3       3       3       1788.73 
5190.08 2       -4
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       4       
4       1018.1  6208.18 46      44
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       5       
1464.48 7672.66 23      -23
-PREHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -1884,8 +1861,7 @@ from noopstreaming(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
@@ -2142,8 +2118,7 @@ Manufacturer#5    almond antique medium spring khaki      
1       1       6       6
 Manufacturer#5 almond antique sky peru orange  1       1       2       2
 Manufacturer#5 almond aquamarine dodger light gainsboro        1       1       
46      46
 Manufacturer#5 almond azure blanched chiffon midnight  1       1       23      
23
-PREHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -2160,8 +2135,7 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -2415,8 +2389,7 @@ Manufacturer#5    almond antique medium spring khaki      
2       2       6       37
 Manufacturer#5 almond antique sky peru orange  3       3       2       39
 Manufacturer#5 almond aquamarine dodger light gainsboro        4       4       
46      85
 Manufacturer#5 almond azure blanched chiffon midnight  5       5       23      
108
-PREHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-explain
+PREHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -2430,8 +2403,7 @@ from noopwithmapstreaming(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-explain
+POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
index 99a7119..08a9bd1 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
@@ -1,16 +1,6 @@
-PREHOOK: query: -- HIVE-2340 deduplicate RS followed by RS
--- hive.optimize.reducededuplication : wherther using this optimization
--- hive.optimize.reducededuplication.min.reducer : number of reducer of 
deduped RS should be this at least
-
--- RS-mGBY-RS-rGBY
-explain select key, sum(key) from (select * from src distribute by key sort by 
key, value) Q1 group by key
+PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- HIVE-2340 deduplicate RS followed by RS
--- hive.optimize.reducededuplication : wherther using this optimization
--- hive.optimize.reducededuplication.min.reducer : number of reducer of 
deduped RS should be this at least
-
--- RS-mGBY-RS-rGBY
-explain select key, sum(key) from (select * from src distribute by key sort by 
key, value) Q1 group by key
+POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -195,11 +185,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- mGBY-RS-rGBY-RS
-explain select key, sum(key) as value from src group by key order by key
+PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- mGBY-RS-rGBY-RS
-explain select key, sum(key) as value from src group by key order by key
+POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -259,11 +247,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-JOIN-mGBY-RS-rGBY
-explain select src.key, sum(src.key) FROM src JOIN src1 ON src.key = src1.key 
group by src.key, src.value
+PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-JOIN-mGBY-RS-rGBY
-explain select src.key, sum(src.key) FROM src JOIN src1 ON src.key = src1.key 
group by src.key, src.value
+POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -367,11 +353,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-JOIN-RS
-explain select src.key, src.value FROM src JOIN src1 ON src.key = src1.key 
order by src.key, src.value
+PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-JOIN-RS
-explain select src.key, src.value FROM src JOIN src1 ON src.key = src1.key 
order by src.key, src.value
+POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -461,11 +445,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- mGBY-RS-rGBY-mGBY-RS-rGBY
-explain from (select key, value from src group by key, value) s select s.key 
group by s.key
+PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- mGBY-RS-rGBY-mGBY-RS-rGBY
-explain from (select key, value from src group by key, value) s select s.key 
group by s.key
+POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2575,11 +2557,9 @@ POSTHOOK: Input: default@src
 96     1
 97     1
 98     1
-PREHOOK: query: -- RS-RS-GBY
-explain select key, sum(key) from (select * from src distribute by key sort by 
key, value) Q1 group by key
+PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-RS-GBY
-explain select key, sum(key) from (select * from src distribute by key sort by 
key, value) Q1 group by key
+POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2764,11 +2744,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-GBY-RS
-explain select key, sum(key) as value from src group by key order by key
+PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-GBY-RS
-explain select key, sum(key) as value from src group by key order by key
+POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2821,11 +2799,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-JOIN-RS-GBY
-explain select src.key, sum(src.key) FROM src JOIN src1 ON src.key = src1.key 
group by src.key, src.value
+PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-JOIN-RS-GBY
-explain select src.key, sum(src.key) FROM src JOIN src1 ON src.key = src1.key 
group by src.key, src.value
+POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -2922,11 +2898,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-JOIN-RS
-explain select src.key, src.value FROM src JOIN src1 ON src.key = src1.key 
order by src.key, src.value
+PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-JOIN-RS
-explain select src.key, src.value FROM src JOIN src1 ON src.key = src1.key 
order by src.key, src.value
+POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -3016,11 +2990,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- RS-GBY-RS-GBY
-explain from (select key, value from src group by key, value) s select s.key 
group by s.key
+PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RS-GBY-RS-GBY
-explain from (select key, value from src group by key, value) s select s.key 
group by s.key
+POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/sample1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample1.q.out 
b/ql/src/test/results/clientpositive/llap/sample1.q.out
index 979c5e5..1f0da49 100644
--- a/ql/src/test/results/clientpositive/llap/sample1.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample1.q.out
@@ -6,14 +6,12 @@ POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt 
STRING, hr STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: -- no input pruning, no sample filter
-EXPLAIN EXTENDED
+PREHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.*
 FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
 WHERE s.ds='2008-04-08' and s.hr='11'
 PREHOOK: type: QUERY
-POSTHOOK: query: -- no input pruning, no sample filter
-EXPLAIN EXTENDED
+POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.*
 FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
 WHERE s.ds='2008-04-08' and s.hr='11'

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/sample10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample10.q.out 
b/ql/src/test/results/clientpositive/llap/sample10.q.out
index 3634b81..d4ad82b 100644
--- a/ql/src/test/results/clientpositive/llap/sample10.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample10.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-create table srcpartbucket (key string, value string) partitioned by (ds 
string, hr string) clustered by (key) into 4 buckets
+PREHOOK: query: create table srcpartbucket (key string, value string) 
partitioned by (ds string, hr string) clustered by (key) into 4 buckets
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@srcpartbucket
-POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-create table srcpartbucket (key string, value string) partitioned by (ds 
string, hr string) clustered by (key) into 4 buckets
+POSTHOOK: query: create table srcpartbucket (key string, value string) 
partitioned by (ds string, hr string) clustered by (key) into 4 buckets
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@srcpartbucket

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
index 96134a3..a3a54d1 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
@@ -1,23 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
---
--- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema 
evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes 
Q file statistics differences...
---
-
-CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 
tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), 
float1 float, double1 double, string1 string, string2 string, date1 date, 
timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str 
string, int_str string, bigint_str string, decimal_str string, float_str 
string, double_str string, date_str string, timestamp_str string, filler string)
+PREHOOK: query: CREATE TABLE schema_evolution_data(insert_num int, boolean1 
boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, 
decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 
string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str 
string, smallint_str string, int_str string, bigint_str string, decimal_str 
string, float_str string, double_str string, date_str string, timestamp_str 
string, filler string)
 row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@schema_evolution_data
-POSTHOOK: query: -- SORT_QUERY_RESULTS
---
--- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned
--- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema 
evolution is always used for ACID.
--- Also, we don't do EXPLAINs on ACID files because the transaction id causes 
Q file statistics differences...
---
-
-CREATE TABLE schema_evolution_data(insert_num int, boolean1 boolean, tinyint1 
tinyint, smallint1 smallint, int1 int, bigint1 bigint, decimal1 decimal(38,18), 
float1 float, double1 double, string1 string, string2 string, date1 date, 
timestamp1 timestamp, boolean_str string, tinyint_str string, smallint_str 
string, int_str string, bigint_str string, decimal_str string, float_str 
string, double_str string, date_str string, timestamp_str string, filler string)
+POSTHOOK: query: CREATE TABLE schema_evolution_data(insert_num int, boolean1 
boolean, tinyint1 tinyint, smallint1 smallint, int1 int, bigint1 bigint, 
decimal1 decimal(38,18), float1 float, double1 double, string1 string, string2 
string, date1 date, timestamp1 timestamp, boolean_str string, tinyint_str 
string, smallint_str string, int_str string, bigint_str string, decimal_str 
string, float_str string, double_str string, date_str string, timestamp_str 
string, filler string)
 row format delimited fields terminated by '|' stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,25 +16,11 @@ POSTHOOK: query: load data local inpath 
'../../data/files/schema_evolution/schem
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@schema_evolution_data
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE ADD COLUMNS
---
---
--- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
---
---
-CREATE TABLE part_add_int_permute_select(insert_num int, a INT, b STRING) 
PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE part_add_int_permute_select(insert_num int, a 
INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED 
AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_add_int_permute_select
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE ADD COLUMNS
---
---
--- SUBSECTION: ALTER TABLE ADD COLUMNS: INT PERMUTE SELECT
---
---
-CREATE TABLE part_add_int_permute_select(insert_num int, a INT, b STRING) 
PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE part_add_int_permute_select(insert_num int, a 
INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED 
AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_add_int_permute_select
@@ -62,13 +34,11 @@ POSTHOOK: Lineage: part_add_int_permute_select 
PARTITION(part=1).a EXPRESSION [(
 POSTHOOK: Lineage: part_add_int_permute_select PARTITION(part=1).b SIMPLE 
[(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col3, 
type:string, comment:), ]
 POSTHOOK: Lineage: part_add_int_permute_select PARTITION(part=1).insert_num 
EXPRESSION 
[(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 _col0  _col1   _col2
-PREHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_permute_select add columns(c int)
+PREHOOK: query: alter table part_add_int_permute_select add columns(c int)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@part_add_int_permute_select
 PREHOOK: Output: default@part_add_int_permute_select
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_permute_select add columns(c int)
+POSTHOOK: query: alter table part_add_int_permute_select add columns(c int)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@part_add_int_permute_select
 POSTHOOK: Output: default@part_add_int_permute_select
@@ -83,14 +53,12 @@ POSTHOOK: Lineage: part_add_int_permute_select 
PARTITION(part=1).b SIMPLE [(valu
 POSTHOOK: Lineage: part_add_int_permute_select PARTITION(part=1).c EXPRESSION 
[(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col4, 
type:string, comment:), ]
 POSTHOOK: Lineage: part_add_int_permute_select PARTITION(part=1).insert_num 
EXPRESSION 
[(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 _col0  _col1   _col2   _col3
-PREHOOK: query: -- SELECT permutation columns to make sure NULL defaulting 
works right
-select insert_num,part,a,b from part_add_int_permute_select
+PREHOOK: query: select insert_num,part,a,b from part_add_int_permute_select
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_add_int_permute_select
 PREHOOK: Input: default@part_add_int_permute_select@part=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- SELECT permutation columns to make sure NULL defaulting 
works right
-select insert_num,part,a,b from part_add_int_permute_select
+POSTHOOK: query: select insert_num,part,a,b from part_add_int_permute_select
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part_add_int_permute_select
 POSTHOOK: Input: default@part_add_int_permute_select@part=1
@@ -132,17 +100,11 @@ POSTHOOK: query: drop table part_add_int_permute_select
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_add_int_permute_select
 POSTHOOK: Output: default@part_add_int_permute_select
-PREHOOK: query: -- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE 
SELECT
---
---
-CREATE TABLE part_add_int_string_permute_select(insert_num int, a INT, b 
STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE part_add_int_string_permute_select(insert_num 
int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets 
STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_add_int_string_permute_select
-POSTHOOK: query: -- SUBSECTION: ALTER TABLE ADD COLUMNS: INT, STRING, PERMUTE 
SELECT
---
---
-CREATE TABLE part_add_int_string_permute_select(insert_num int, a INT, b 
STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE part_add_int_string_permute_select(insert_num 
int, a INT, b STRING) PARTITIONED BY(part INT) clustered by (a) into 2 buckets 
STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_add_int_string_permute_select
@@ -156,13 +118,11 @@ POSTHOOK: Lineage: part_add_int_string_permute_select 
PARTITION(part=1).a EXPRES
 POSTHOOK: Lineage: part_add_int_string_permute_select PARTITION(part=1).b 
SIMPLE 
[(values__tmp__table__3)values__tmp__table__3.FieldSchema(name:tmp_values_col3, 
type:string, comment:), ]
 POSTHOOK: Lineage: part_add_int_string_permute_select 
PARTITION(part=1).insert_num EXPRESSION 
[(values__tmp__table__3)values__tmp__table__3.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 _col0  _col1   _col2
-PREHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_string_permute_select add columns(c int, d string)
+PREHOOK: query: alter table part_add_int_string_permute_select add columns(c 
int, d string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@part_add_int_string_permute_select
 PREHOOK: Output: default@part_add_int_string_permute_select
-POSTHOOK: query: -- Table-Non-Cascade ADD COLUMNS ...
-alter table part_add_int_string_permute_select add columns(c int, d string)
+POSTHOOK: query: alter table part_add_int_string_permute_select add columns(c 
int, d string)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@part_add_int_string_permute_select
 POSTHOOK: Output: default@part_add_int_string_permute_select
@@ -178,14 +138,12 @@ POSTHOOK: Lineage: part_add_int_string_permute_select 
PARTITION(part=1).c EXPRES
 POSTHOOK: Lineage: part_add_int_string_permute_select PARTITION(part=1).d 
SIMPLE 
[(values__tmp__table__4)values__tmp__table__4.FieldSchema(name:tmp_values_col5, 
type:string, comment:), ]
 POSTHOOK: Lineage: part_add_int_string_permute_select 
PARTITION(part=1).insert_num EXPRESSION 
[(values__tmp__table__4)values__tmp__table__4.FieldSchema(name:tmp_values_col1, 
type:string, comment:), ]
 _col0  _col1   _col2   _col3   _col4
-PREHOOK: query: -- SELECT permutation columns to make sure NULL defaulting 
works right
-select insert_num,part,a,b from part_add_int_string_permute_select
+PREHOOK: query: select insert_num,part,a,b from 
part_add_int_string_permute_select
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_add_int_string_permute_select
 PREHOOK: Input: default@part_add_int_string_permute_select@part=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- SELECT permutation columns to make sure NULL defaulting 
works right
-select insert_num,part,a,b from part_add_int_string_permute_select
+POSTHOOK: query: select insert_num,part,a,b from 
part_add_int_string_permute_select
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part_add_int_string_permute_select
 POSTHOOK: Input: default@part_add_int_string_permute_select@part=1
@@ -279,25 +237,11 @@ POSTHOOK: query: drop table 
part_add_int_string_permute_select
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_add_int_string_permute_select
 POSTHOOK: Output: default@part_add_int_string_permute_select
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, 
CHAR, VARCHAR)
---
-CREATE TABLE part_change_string_group_double(insert_num int, c1 STRING, c2 
CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT) clustered by (c1) 
into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+PREHOOK: query: CREATE TABLE part_change_string_group_double(insert_num int, 
c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT) 
clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES 
('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_string_group_double
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> DOUBLE: (STRING, 
CHAR, VARCHAR)
---
-CREATE TABLE part_change_string_group_double(insert_num int, c1 STRING, c2 
CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT) clustered by (c1) 
into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
+POSTHOOK: query: CREATE TABLE part_change_string_group_double(insert_num int, 
c1 STRING, c2 CHAR(50), c3 VARCHAR(50), b STRING) PARTITIONED BY(part INT) 
clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES 
('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_string_group_double
@@ -315,13 +259,11 @@ POSTHOOK: Lineage: part_change_string_group_double 
PARTITION(part=1).c2 EXPRESSI
 POSTHOOK: Lineage: part_change_string_group_double PARTITION(part=1).c3 
EXPRESSION 
[(schema_evolution_data)schema_evolution_data.FieldSchema(name:double_str, 
type:string, comment:null), ]
 POSTHOOK: Lineage: part_change_string_group_double 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, 
type:int, comment:null), ]
 _col0  _col1   _col2   _col3   _col4
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_string_group_double replace columns (insert_num int, 
c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING)
+PREHOOK: query: alter table part_change_string_group_double replace columns 
(insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_string_group_double
 PREHOOK: Output: default@part_change_string_group_double
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_string_group_double replace columns (insert_num int, 
c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING)
+POSTHOOK: query: alter table part_change_string_group_double replace columns 
(insert_num int, c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_string_group_double
 POSTHOOK: Output: default@part_change_string_group_double
@@ -363,25 +305,11 @@ POSTHOOK: query: drop table 
part_change_string_group_double
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_string_group_double
 POSTHOOK: Output: default@part_change_string_group_double
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: 
DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc)
---
-CREATE TABLE part_change_date_group_string_group_date_timestamp(insert_num 
int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, 
c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT)  
clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES 
('transactional'='true')
+PREHOOK: query: CREATE TABLE 
part_change_date_group_string_group_date_timestamp(insert_num int, c1 DATE, c2 
DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 
TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT)  clustered by (c1) 
into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_date_group_string_group_date_timestamp
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for DATE_GROUP -> STRING_GROUP: 
DATE,TIMESTAMP, (STRING, CHAR, CHAR trunc, VARCHAR, VARCHAR trunc)
---
-CREATE TABLE part_change_date_group_string_group_date_timestamp(insert_num 
int, c1 DATE, c2 DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, 
c8 TIMESTAMP, c9 TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT)  
clustered by (c1) into 2 buckets STORED AS ORC TBLPROPERTIES 
('transactional'='true')
+POSTHOOK: query: CREATE TABLE 
part_change_date_group_string_group_date_timestamp(insert_num int, c1 DATE, c2 
DATE, c3 DATE, c4 DATE, c5 DATE, c6 TIMESTAMP, c7 TIMESTAMP, c8 TIMESTAMP, c9 
TIMESTAMP, c10 TIMESTAMP, b STRING) PARTITIONED BY(part INT)  clustered by (c1) 
into 2 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_change_date_group_string_group_date_timestamp
@@ -406,13 +334,11 @@ POSTHOOK: Lineage: 
part_change_date_group_string_group_date_timestamp PARTITION(
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp 
PARTITION(part=1).c9 SIMPLE 
[(schema_evolution_data)schema_evolution_data.FieldSchema(name:timestamp1, 
type:timestamp, comment:null), ]
 POSTHOOK: Lineage: part_change_date_group_string_group_date_timestamp 
PARTITION(part=1).insert_num SIMPLE 
[(schema_evolution_data)schema_evolution_data.FieldSchema(name:insert_num, 
type:int, comment:null), ]
 insert_num     date1   date1   date1   date1   date1   timestamp1      
timestamp1      timestamp1      timestamp1      timestamp1      _c11
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_date_group_string_group_date_timestamp replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 
VARCHAR(15), b STRING)
+PREHOOK: query: alter table part_change_date_group_string_group_date_timestamp 
replace columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 
VARCHAR(50), c5 VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 
VARCHAR(50), c10 VARCHAR(15), b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_date_group_string_group_date_timestamp
 PREHOOK: Output: default@part_change_date_group_string_group_date_timestamp
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_date_group_string_group_date_timestamp replace 
columns(insert_num int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 
VARCHAR(15), c6 STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 
VARCHAR(15), b STRING)
+POSTHOOK: query: alter table 
part_change_date_group_string_group_date_timestamp replace columns(insert_num 
int, c1 STRING, c2 CHAR(50), c3 CHAR(15), c4 VARCHAR(50), c5 VARCHAR(15), c6 
STRING, c7 CHAR(50), c8 CHAR(15), c9 VARCHAR(50), c10 VARCHAR(15), b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: default@part_change_date_group_string_group_date_timestamp
 POSTHOOK: Output: default@part_change_date_group_string_group_date_timestamp
@@ -460,18 +386,7 @@ POSTHOOK: query: drop table 
part_change_date_group_string_group_date_timestamp
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_date_group_string_group_date_timestamp
 POSTHOOK: Output: default@part_change_date_group_string_group_date_timestamp
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP:
---           (TINYINT, SMALLINT, INT, BIGINT), STRING and
---           (TINYINT, SMALLINT, INT, BIGINT), CHAR and CHAR trunc and
---           (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
---
---
-CREATE TABLE 
part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+PREHOOK: query: CREATE TABLE 
part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
              c1 tinyint, c2 smallint, c3 int, c4 bigint,
              c5 tinyint, c6 smallint, c7 int, c8 bigint, c9 tinyint, c10 
smallint, c11 int, c12 bigint,
              c13 tinyint, c14 smallint, c15 int, c16 bigint, c17 tinyint, c18 
smallint, c19 int, c20 bigint,
@@ -479,18 +394,7 @@ CREATE TABLE 
part_change_numeric_group_string_group_multi_ints_string_group(inse
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: 
default@part_change_numeric_group_string_group_multi_ints_string_group
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP:
---           (TINYINT, SMALLINT, INT, BIGINT), STRING and
---           (TINYINT, SMALLINT, INT, BIGINT), CHAR and CHAR trunc and
---           (TINYINT, SMALLINT, INT, BIGINT), VARCHAR and VARCHAR trunc
---
---
-CREATE TABLE 
part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
+POSTHOOK: query: CREATE TABLE 
part_change_numeric_group_string_group_multi_ints_string_group(insert_num int,
              c1 tinyint, c2 smallint, c3 int, c4 bigint,
              c5 tinyint, c6 smallint, c7 int, c8 bigint, c9 tinyint, c10 
smallint, c11 int, c12 bigint,
              c13 tinyint, c14 smallint, c15 int, c16 bigint, c17 tinyint, c18 
smallint, c19 int, c20 bigint,
@@ -553,8 +457,7 @@ insert_num  part    c1      c2      c3      c4      c5      
c6      c7      c8      c9      c10     c11     c12     c13     c14     c15     
c16     c17     c18     c
 103    1       NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    original
 104    1       23      834     203332  888888857923222 23      834     203332  
888888857923222 23      834     203332  888888857923222 23      834     203332  
888888857923222 23      834     203332  888888857923222 original
 105    1       -99     -28300  -999992 -222282153733   -99     -28300  -999992 
-222282153733   -99     -28300  -999992 -222282153733   -99     -28300  -999992 
-222282153733   -99     -28300  -999992 -222282153733   original
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_multi_ints_string_group 
replace columns (insert_num int,
+PREHOOK: query: alter table 
part_change_numeric_group_string_group_multi_ints_string_group replace columns 
(insert_num int,
              c1 STRING, c2 STRING, c3 STRING, c4 STRING,
              c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 CHAR(50), c9 CHAR(5), 
c10 CHAR(5), c11 CHAR(5), c12 CHAR(5),
              c13 VARCHAR(50), c14 VARCHAR(50), c15 VARCHAR(50), c16 
VARCHAR(50), c17 VARCHAR(5), c18 VARCHAR(5), c19 VARCHAR(5), c20 VARCHAR(5),
@@ -562,8 +465,7 @@ alter table 
part_change_numeric_group_string_group_multi_ints_string_group repla
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: 
default@part_change_numeric_group_string_group_multi_ints_string_group
 PREHOOK: Output: 
default@part_change_numeric_group_string_group_multi_ints_string_group
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_multi_ints_string_group 
replace columns (insert_num int,
+POSTHOOK: query: alter table 
part_change_numeric_group_string_group_multi_ints_string_group replace columns 
(insert_num int,
              c1 STRING, c2 STRING, c3 STRING, c4 STRING,
              c5 CHAR(50), c6 CHAR(50), c7 CHAR(50), c8 CHAR(50), c9 CHAR(5), 
c10 CHAR(5), c11 CHAR(5), c12 CHAR(5),
              c13 VARCHAR(50), c14 VARCHAR(50), c15 VARCHAR(50), c16 
VARCHAR(50), c17 VARCHAR(5), c18 VARCHAR(5), c19 VARCHAR(5), c20 VARCHAR(5),
@@ -673,14 +575,7 @@ POSTHOOK: query: drop table 
part_change_numeric_group_string_group_multi_ints_st
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: 
default@part_change_numeric_group_string_group_multi_ints_string_group
 POSTHOOK: Output: 
default@part_change_numeric_group_string_group_multi_ints_string_group
-PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP:
---            (DECIMAL, FLOAT, DOUBLE), STRING and
---            (DECIMAL, FLOAT, DOUBLE), CHAR and CHAR trunc and
---            (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
---
---
-CREATE TABLE 
part_change_numeric_group_string_group_floating_string_group(insert_num int,
+PREHOOK: query: CREATE TABLE 
part_change_numeric_group_string_group_floating_string_group(insert_num int,
               c1 decimal(38,18), c2 float, c3 double,
               c4 decimal(38,18), c5 float, c6 double, c7 decimal(38,18), c8 
float, c9 double,
               c10 decimal(38,18), c11 float, c12 double, c13 decimal(38,18), 
c14 float, c15 double,
@@ -688,14 +583,7 @@ CREATE TABLE 
part_change_numeric_group_string_group_floating_string_group(insert
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: 
default@part_change_numeric_group_string_group_floating_string_group
-POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for NUMERIC_GROUP -> STRING_GROUP:
---            (DECIMAL, FLOAT, DOUBLE), STRING and
---            (DECIMAL, FLOAT, DOUBLE), CHAR and CHAR trunc and
---            (DECIMAL, FLOAT, DOUBLE), VARCHAR and VARCHAR trunc
---
---
-CREATE TABLE 
part_change_numeric_group_string_group_floating_string_group(insert_num int,
+POSTHOOK: query: CREATE TABLE 
part_change_numeric_group_string_group_floating_string_group(insert_num int,
               c1 decimal(38,18), c2 float, c3 double,
               c4 decimal(38,18), c5 float, c6 double, c7 decimal(38,18), c8 
float, c9 double,
               c10 decimal(38,18), c11 float, c12 double, c13 decimal(38,18), 
c14 float, c15 double,
@@ -753,8 +641,7 @@ insert_num  part    c1      c2      c3      c4      c5      
c6      c7      c8      c9      c10     c11     c12     c13     c14     c15     
b
 103    1       NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    original
 104    1       66475.561431000000000000        -100.35978      30.774  
66475.561431000000000000        -100.35978      30.774  
66475.561431000000000000        -100.35978      30.774  
66475.561431000000000000        -100.35978      30.774  
66475.561431000000000000        -100.35978      30.774  original
 105    1       9250340.750000000000000000      NULL    46114.28        
9250340.750000000000000000      NULL    46114.28        
9250340.750000000000000000      NULL    46114.28        
9250340.750000000000000000      NULL    46114.28        
9250340.750000000000000000      NULL    46114.28        original
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_floating_string_group 
replace columns (insert_num int,
+PREHOOK: query: alter table 
part_change_numeric_group_string_group_floating_string_group replace columns 
(insert_num int,
               c1 STRING, c2 STRING, c3 STRING,
               c4 CHAR(50), c5 CHAR(50), c6 CHAR(50), c7 CHAR(7), c8 CHAR(7), 
c9 CHAR(7),
               c10 VARCHAR(50), c11 VARCHAR(50), c12 VARCHAR(50), c13 
VARCHAR(7), c14 VARCHAR(7), c15 VARCHAR(7),
@@ -762,8 +649,7 @@ alter table 
part_change_numeric_group_string_group_floating_string_group replace
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: 
default@part_change_numeric_group_string_group_floating_string_group
 PREHOOK: Output: 
default@part_change_numeric_group_string_group_floating_string_group
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_numeric_group_string_group_floating_string_group 
replace columns (insert_num int,
+POSTHOOK: query: alter table 
part_change_numeric_group_string_group_floating_string_group replace columns 
(insert_num int,
               c1 STRING, c2 STRING, c3 STRING,
               c4 CHAR(50), c5 CHAR(50), c6 CHAR(50), c7 CHAR(7), c8 CHAR(7), 
c9 CHAR(7),
               c10 VARCHAR(50), c11 VARCHAR(50), c12 VARCHAR(50), c13 
VARCHAR(7), c14 VARCHAR(7), c15 VARCHAR(7),
@@ -868,30 +754,14 @@ POSTHOOK: query: drop table 
part_change_numeric_group_string_group_floating_stri
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: 
default@part_change_numeric_group_string_group_floating_string_group
 POSTHOOK: Output: 
default@part_change_numeric_group_string_group_floating_string_group
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: 
STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and
---      CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, 
STRING)
---
-CREATE TABLE part_change_string_group_string_group_string(insert_num int,
+PREHOOK: query: CREATE TABLE 
part_change_string_group_string_group_string(insert_num int,
            c1 string, c2 string, c3 string, c4 string,
            c5 CHAR(50), c6 CHAR(50), c7 CHAR(50),
            c8 VARCHAR(50), c9 VARCHAR(50), c10 VARCHAR(50), b STRING) 
PARTITIONED BY(part INT)  clustered by (c1) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_change_string_group_string_group_string
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for STRING_GROUP -> STRING_GROUP: 
STRING, (CHAR, CHAR trunc, VARCHAR, VARCHAR trunc) and
---      CHAR, (VARCHAR, VARCHAR trunc, STRING) and VARCHAR, (CHAR, CHAR trunc, 
STRING)
---
-CREATE TABLE part_change_string_group_string_group_string(insert_num int,
+POSTHOOK: query: CREATE TABLE 
part_change_string_group_string_group_string(insert_num int,
            c1 string, c2 string, c3 string, c4 string,
            c5 CHAR(50), c6 CHAR(50), c7 CHAR(50),
            c8 VARCHAR(50), c9 VARCHAR(50), c10 VARCHAR(50), b STRING) 
PARTITIONED BY(part INT)  clustered by (c1) into 2 buckets STORED AS ORC 
TBLPROPERTIES ('transactional'='true')
@@ -943,16 +813,14 @@ insert_num        part    c1      c2      c3      c4      
b
 103    1                                       original
 104    1       I cooked        I cooked        I cooked        I cooked        
original
 105    1       200     200     200     200     original
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_string_group_string_group_string replace columns 
(insert_num int,
+PREHOOK: query: alter table part_change_string_group_string_group_string 
replace columns (insert_num int,
            c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9),
            c5 VARCHAR(50), c6 VARCHAR(9), c7 STRING,
            c8 CHAR(50), c9 CHAR(9), c10 STRING, b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: default@part_change_string_group_string_group_string
 PREHOOK: Output: default@part_change_string_group_string_group_string
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_string_group_string_group_string replace columns 
(insert_num int,
+POSTHOOK: query: alter table part_change_string_group_string_group_string 
replace columns (insert_num int,
            c1 CHAR(50), c2 CHAR(9), c3 VARCHAR(50), c4 CHAR(9),
            c5 VARCHAR(50), c6 VARCHAR(9), c7 STRING,
            c8 CHAR(50), c9 CHAR(9), c10 STRING, b STRING)
@@ -1011,18 +879,7 @@ POSTHOOK: query: drop table 
part_change_string_group_string_group_string
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@part_change_string_group_string_group_string
 POSTHOOK: Output: default@part_change_string_group_string_group_string
-PREHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP:
---          TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          BIGINT, (DECIMAL, FLOAT, DOUBLE)
---
-CREATE TABLE 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+PREHOOK: query: CREATE TABLE 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
                                 c1 tinyint, c2 tinyint, c3 tinyint, c4 
tinyint, c5 tinyint, c6 tinyint,
                                 c7 smallint, c8 smallint, c9 smallint, c10 
smallint, c11 smallint,
                                 c12 int, c13 int, c14 int, c15 int,
@@ -1031,18 +888,7 @@ CREATE TABLE 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint
-POSTHOOK: query: 
------------------------------------------------------------------------------------------
--- SECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP
---
---
---
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP:
---          TINYINT, (SMALLINT, INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          SMALLINT, (INT, BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          INT, (BIGINT, DECIMAL, FLOAT, DOUBLE) and
---          BIGINT, (DECIMAL, FLOAT, DOUBLE)
---
-CREATE TABLE 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
+POSTHOOK: query: CREATE TABLE 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint(insert_num int,
                                 c1 tinyint, c2 tinyint, c3 tinyint, c4 
tinyint, c5 tinyint, c6 tinyint,
                                 c7 smallint, c8 smallint, c9 smallint, c10 
smallint, c11 smallint,
                                 c12 int, c13 int, c14 int, c15 int,
@@ -1106,8 +952,7 @@ insert_num part    c1      c2      c3      c4      c5      
c6      c7      c8      c9      c10     c11     c12     c13     c14     c15     
c16     c17     c18     b
 103    1       NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
original
 104    1       23      23      23      23      23      23      834     834     
834     834     834     203332  203332  203332  203332  888888857923222 
888888857923222 888888857923222 original
 105    1       -99     -99     -99     -99     -99     -99     -28300  -28300  
-28300  -28300  -28300  -999992 -999992 -999992 -999992 -222282153733   
-222282153733   -222282153733   original
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint_to_bigint 
replace columns (insert_num int,
+PREHOOK: query: alter table 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns 
(insert_num int,
              c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 
DOUBLE,
              c7 INT, c8 BIGINT, c9 decimal(38,18), c10 FLOAT, c11 DOUBLE,
              c12 BIGINT, c13 decimal(38,18), c14 FLOAT, c15 DOUBLE,
@@ -1116,8 +961,7 @@ alter table 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint replace
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: 
default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint
 PREHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_tinyint_to_bigint 
replace columns (insert_num int,
+POSTHOOK: query: alter table 
part_change_lower_to_higher_numeric_group_tinyint_to_bigint replace columns 
(insert_num int,
              c1 SMALLINT, c2 INT, c3 BIGINT, c4 decimal(38,18), c5 FLOAT, c6 
DOUBLE,
              c7 INT, c8 BIGINT, c9 decimal(38,18), c10 FLOAT, c11 DOUBLE,
              c12 BIGINT, c13 decimal(38,18), c14 FLOAT, c15 DOUBLE,
@@ -1188,24 +1032,14 @@ POSTHOOK: query: drop table 
part_change_lower_to_higher_numeric_group_tinyint_to
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: 
default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint
 POSTHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_tinyint_to_bigint
-PREHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP:
---          DECIMAL, (FLOAT, DOUBLE) and
---          FLOAT, (DOUBLE)
---
-CREATE TABLE 
part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+PREHOOK: query: CREATE TABLE 
part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
            c1 decimal(38,18), c2 decimal(38,18),
            c3 float,
            b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets 
STORED AS ORC TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_decimal_to_float
-POSTHOOK: query: --
--- SUBSECTION: ALTER TABLE CHANGE COLUMNS for "lower" type to "higher" 
NUMERIC_GROUP:
---          DECIMAL, (FLOAT, DOUBLE) and
---          FLOAT, (DOUBLE)
---
-CREATE TABLE 
part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
+POSTHOOK: query: CREATE TABLE 
part_change_lower_to_higher_numeric_group_decimal_to_float(insert_num int,
            c1 decimal(38,18), c2 decimal(38,18),
            c3 float,
            b STRING) PARTITIONED BY(part INT) clustered by (c1) into 2 buckets 
STORED AS ORC TBLPROPERTIES ('transactional'='true')
@@ -1248,13 +1082,11 @@ insert_num      part    c1      c2      c3      b
 103    1       NULL    NULL    NULL    original
 104    1       66475.561431000000000000        66475.561431000000000000        
-100.35978      original
 105    1       9250340.750000000000000000      9250340.750000000000000000      
NULL    original
-PREHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal_to_float replace 
columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING)
+PREHOOK: query: alter table 
part_change_lower_to_higher_numeric_group_decimal_to_float replace columns 
(insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING)
 PREHOOK: type: ALTERTABLE_REPLACECOLS
 PREHOOK: Input: 
default@part_change_lower_to_higher_numeric_group_decimal_to_float
 PREHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_decimal_to_float
-POSTHOOK: query: -- Table-Non-Cascade CHANGE COLUMNS ...
-alter table part_change_lower_to_higher_numeric_group_decimal_to_float replace 
columns (insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING)
+POSTHOOK: query: alter table 
part_change_lower_to_higher_numeric_group_decimal_to_float replace columns 
(insert_num int, c1 float, c2 double, c3 DOUBLE, b STRING)
 POSTHOOK: type: ALTERTABLE_REPLACECOLS
 POSTHOOK: Input: 
default@part_change_lower_to_higher_numeric_group_decimal_to_float
 POSTHOOK: Output: 
default@part_change_lower_to_higher_numeric_group_decimal_to_float

Reply via email to