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

[19/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/mapjoin46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
index cf8912d..8fd9448 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin46.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
 POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
 POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
 POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Basic outer join
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Basic outer join
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value)
@@ -134,16 +132,14 @@ NULL	NULL	None	NULL	NULL	NULL
 100	1	Bob	NULL	NULL	NULL
 101	2	Car	102	2	Del
 101	2	Car	103	2	Ema
-PREHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
   AND test1.key between 100 and 102
   AND test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -245,15 +241,13 @@ NULL	NULL	None	NULL	NULL	NULL
 100	1	Bob	NULL	NULL	NULL
 101	2	Car	102	2	Del
 Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102
   AND test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102
@@ -350,14 +344,12 @@ NULL	NULL	None	NULL	NULL	NULL
 99	2	Mat	NULL	NULL	NULL
 100	1	Bob	102	2	Del
 101	2	Car	102	2	Del
-PREHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value AND true)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Conjunction with pred on multiple inputs and none (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value AND true)
@@ -447,14 +439,12 @@ POSTHOOK: Input: default@test2
 NULL	NULL	NULL	104	3	Fli
 NULL	NULL	NULL	105	NULL	None
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102)
@@ -552,16 +542,14 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	104	3	Fli
 101	2	Car	103	2	Ema
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -664,15 +652,13 @@ NULL	NULL	None	102	2	Del
 101	2	Car	104	3	Fli
 101	2	Car	103	2	Ema
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -772,15 +758,13 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	104	3	Fli
 101	2	Car	103	2	Ema
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -874,16 +858,14 @@ NULL	NULL	None	102	2	Del
 100	1	Bob	102	2	Del
 101	2	Car	102	2	Del
 101	2	Car	103	2	Ema
-PREHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
   AND (test1.key between 100 and 102
     OR test2.key between 100 and 102))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -981,16 +963,14 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	102	2	Del
 101	2	Car	103	2	Ema
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1093,15 +1073,13 @@ NULL	NULL	None	102	2	Del
 101	2	Car	105	NULL	None
 100	1	Bob	105	NULL	None
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1198,15 +1176,13 @@ POSTHOOK: Input: default@test2
 101	2	Car	105	NULL	None
 100	1	Bob	105	NULL	None
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1302,16 +1278,14 @@ NULL	NULL	None	102	2	Del
 99	2	Mat	103	2	Ema
 NULL	NULL	NULL	104	3	Fli
 NULL	NULL	NULL	105	NULL	None
-PREHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
   AND (test1.key between 100 and 102
     OR test2.key between 100 and 102))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (right outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 RIGHT OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1407,16 +1381,14 @@ POSTHOOK: Input: default@test2
 NULL	NULL	NULL	104	3	Fli
 NULL	NULL	NULL	105	NULL	None
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and single inputs (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1524,15 +1496,13 @@ NULL	NULL	None	102	2	Del
 101	2	Car	104	3	Fli
 101	2	Car	105	NULL	None
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
   OR test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and left input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1637,15 +1607,13 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	104	3	Fli
 101	2	Car	105	NULL	None
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
-PREHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
   OR test2.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Disjunction with pred on multiple inputs and right input (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1746,16 +1714,14 @@ NULL	NULL	None	102	2	Del
 101	2	Car	103	2	Ema
 NULL	NULL	NULL	104	3	Fli
 NULL	NULL	NULL	105	NULL	None
-PREHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
   AND (test1.key between 100 and 102
     OR test2.key between 100 and 102))
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Keys plus residual (full outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 FULL OUTER JOIN test2
 ON (test1.value=test2.value
@@ -1862,8 +1828,7 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	103	2	Ema
 NULL	NULL	NULL	104	3	Fli
 Warning: Shuffle Join MERGEJOIN[26][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Reducer 3' is a cross product
-PREHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) ) 
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM (
   SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,
@@ -1883,8 +1848,7 @@ FULL OUTER JOIN (
   ) sq2
 ON (sq1.value1 is null or sq2.value4 is null and sq2.value3 != sq1.value2)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Mixed ( FOJ (ROJ, LOJ) ) 
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM (
   SELECT test1.key AS key1, test1.value AS value1, test1.col_1 AS col_1,

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
index 01f1f80..4539684 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
@@ -1,6 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE over1k(t tinyint,
+PREHOOK: query: CREATE TABLE over1k(t tinyint,
            si smallint,
            i int,
            b bigint,
@@ -16,9 +14,7 @@ STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@over1k
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-CREATE TABLE over1k(t tinyint,
+POSTHOOK: query: CREATE TABLE over1k(t tinyint,
            si smallint,
            i int,
            b bigint,

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
index f5f1bad..81a8546 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_emit_interval.q.out
@@ -36,14 +36,12 @@ POSTHOOK: Output: default@test2
 POSTHOOK: Lineage: test2.col_2 SIMPLE [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col3, type:string, comment:), ]
 POSTHOOK: Lineage: test2.key EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col1, type:string, comment:), ]
 POSTHOOK: Lineage: test2.value EXPRESSION [(values__tmp__table__2)values__tmp__table__2.FieldSchema(name:tmp_values_col2, type:string, comment:), ]
-PREHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value AND test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Equi-condition and condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.value=test2.value AND test1.key between 100 and 102)
@@ -137,14 +135,12 @@ NULL	NULL	None	NULL	NULL	NULL
 101	2	Car	102	2	Del
 101	2	Car	103	2	Ema
 Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Condition on one input (left outer join)
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM test1 LEFT OUTER JOIN test2
 ON (test1.key between 100 and 102)

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
index e129556..4a9b7d7 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
@@ -1,14 +1,6 @@
-PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin
-
--- SORT_QUERY_RESULTS
-
-explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key)
+PREHOOK: query: explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin
-
--- SORT_QUERY_RESULTS
-
-explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key)
+POSTHOOK: query: explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.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/merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/merge1.q.out b/ql/src/test/results/clientpositive/llap/merge1.q.out
index 4ec5d06..4bcb728 100644
--- a/ql/src/test/results/clientpositive/llap/merge1.q.out
+++ b/ql/src/test/results/clientpositive/llap/merge1.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table dest1(key int, val int)
+PREHOOK: query: create table dest1(key int, val int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table dest1(key int, val int)
+POSTHOOK: query: create table dest1(key int, val int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/merge2.q.out b/ql/src/test/results/clientpositive/llap/merge2.q.out
index 383c598..aa0567b 100644
--- a/ql/src/test/results/clientpositive/llap/merge2.q.out
+++ b/ql/src/test/results/clientpositive/llap/merge2.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table test1(key int, val int)
+PREHOOK: query: create table test1(key int, val int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@test1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table test1(key int, val int)
+POSTHOOK: query: create table test1(key int, val int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@test1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/mergejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mergejoin.q.out b/ql/src/test/results/clientpositive/llap/mergejoin.q.out
index b73b427..24257a0 100644
--- a/ql/src/test/results/clientpositive/llap/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mergejoin.q.out
@@ -1,11 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+PREHOOK: query: explain
 select * from src a join src1 b on a.key = b.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-explain
+POSTHOOK: query: explain
 select * from src a join src1 b on a.key = b.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
index 1eafc46..dd6bf48 100644
--- a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
@@ -1620,12 +1620,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 2008-04-08	2008-04-09
-PREHOOK: query: -- HIVE-3594 URI encoding for temporary path
-alter table TEST2 add partition (ds='01:10:10', hr='01')
+PREHOOK: query: alter table TEST2 add partition (ds='01:10:10', hr='01')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: default@test2
-POSTHOOK: query: -- HIVE-3594 URI encoding for temporary path
-alter table TEST2 add partition (ds='01:10:10', hr='01')
+POSTHOOK: query: alter table TEST2 add partition (ds='01:10:10', hr='01')
 POSTHOOK: type: ALTERTABLE_ADDPARTS
 POSTHOOK: Output: default@test2
 POSTHOOK: Output: default@test2@ds=01%3A10%3A10/hr=01

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/mrr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mrr.q.out b/ql/src/test/results/clientpositive/llap/mrr.q.out
index 6272d04..1437d5d 100644
--- a/ql/src/test/results/clientpositive/llap/mrr.q.out
+++ b/ql/src/test/results/clientpositive/llap/mrr.q.out
@@ -1,12 +1,6 @@
-PREHOOK: query: -- simple query with multiple reduce stages
--- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
+PREHOOK: query: EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
 PREHOOK: type: QUERY
-POSTHOOK: query: -- simple query with multiple reduce stages
--- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
+POSTHOOK: query: EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -396,11 +390,9 @@ POSTHOOK: Input: default@src
 96	1
 97	2
 98	2
-PREHOOK: query: -- join query with multiple reduce stages;
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
+PREHOOK: query: EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- join query with multiple reduce stages;
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
+POSTHOOK: query: EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -832,11 +824,9 @@ POSTHOOK: Input: default@src
 96	1
 97	1
 98	1
-PREHOOK: query: -- same query with broadcast join
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
+PREHOOK: query: EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- same query with broadcast join
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
+POSTHOOK: query: EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1261,8 +1251,7 @@ POSTHOOK: Input: default@src
 96	1
 97	1
 98	1
-PREHOOK: query: -- query with multiple branches in the task dag
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * 
 FROM
   (SELECT key, count(value) as cnt 
@@ -1278,8 +1267,7 @@ WHERE
   s1.cnt > 1
 ORDER BY s1.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- query with multiple branches in the task dag
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * 
 FROM
   (SELECT key, count(value) as cnt 
@@ -1677,15 +1665,13 @@ POSTHOOK: Input: default@src
 95	2	95	2	95	2
 97	2	97	2	97	2
 98	2	98	2	98	2
-PREHOOK: query: -- query with broadcast join in the reduce stage
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT *
 FROM
   (SELECT key, count(value) as cnt FROM src GROUP BY key) s1
   JOIN src ON (s1.key = src.key) order by s1.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- query with broadcast join in the reduce stage
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT *
 FROM
   (SELECT key, count(value) as cnt FROM src GROUP BY key) s1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
index eac269c..a6da24b 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
@@ -320,9 +320,7 @@ POSTHOOK: Input: default@smalltbl2
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 580
-PREHOOK: query: -- Now run a query with two-way join, which should be converted into a
--- map-join followed by groupby - two MR jobs overall 
-explain
+PREHOOK: query: explain
 select count(*) FROM
 (select bigTbl.key as key, bigTbl.value as value1,
  bigTbl.value as value2 FROM bigTbl JOIN smallTbl1 
@@ -331,9 +329,7 @@ select count(*) FROM
 JOIN                                                                  
 smallTbl2 on (firstjoin.value1 = smallTbl2.value)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Now run a query with two-way join, which should be converted into a
--- map-join followed by groupby - two MR jobs overall 
-explain
+POSTHOOK: query: explain
 select count(*) FROM
 (select bigTbl.key as key, bigTbl.value as value1,
  bigTbl.value as value2 FROM bigTbl JOIN smallTbl1 
@@ -487,10 +483,7 @@ POSTHOOK: Input: default@smalltbl2
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 580
-PREHOOK: query: -- Now run a query with two-way join, which should first be converted into a
--- map-join followed by groupby and then finally into a single MR job.
-
-explain
+PREHOOK: query: explain
 select count(*) FROM
 (select bigTbl.key as key, bigTbl.value as value1,
  bigTbl.value as value2 FROM bigTbl JOIN smallTbl1
@@ -500,10 +493,7 @@ JOIN
 smallTbl2 on (firstjoin.value1 = smallTbl2.value)
 group by smallTbl2.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Now run a query with two-way join, which should first be converted into a
--- map-join followed by groupby and then finally into a single MR job.
-
-explain
+POSTHOOK: query: explain
 select count(*) FROM
 (select bigTbl.key as key, bigTbl.value as value1,
  bigTbl.value as value2 FROM bigTbl JOIN smallTbl1
@@ -752,8 +742,7 @@ RUN: Stage-1:MAPRED
 RUN: Stage-2:DEPENDENCY_COLLECTION
 RUN: Stage-0:MOVE
 RUN: Stage-3:STATS
-PREHOOK: query: -- First disable noconditionaltask
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -786,8 +775,7 @@ FROM (SELECT join2.key1 as key1,
       JOIN smallTbl3 ON (join2.key2 = smallTbl3.key)) join3
 JOIN smallTbl4 ON (join3.key3 = smallTbl4.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- First disable noconditionaltask
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1089,10 +1077,7 @@ POSTHOOK: Input: default@smalltbl4
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 247580	247580	247580	247580	247580	247580	548662743780	548662743780
-PREHOOK: query: -- Enable noconditionaltask and set the size of hive.auto.convert.join.noconditionaltask.size
--- to 10000, which is large enough to fit all four small tables (smallTbl1 to smallTbl4).
--- We will use a single MR job to evaluate this query.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1125,10 +1110,7 @@ FROM (SELECT join2.key1 as key1,
       JOIN smallTbl3 ON (join2.key2 = smallTbl3.key)) join3
 JOIN smallTbl4 ON (join3.key3 = smallTbl4.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Enable noconditionaltask and set the size of hive.auto.convert.join.noconditionaltask.size
--- to 10000, which is large enough to fit all four small tables (smallTbl1 to smallTbl4).
--- We will use a single MR job to evaluate this query.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1430,11 +1412,7 @@ POSTHOOK: Input: default@smalltbl4
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 247580	247580	247580	247580	247580	247580	548662743780	548662743780
-PREHOOK: query: -- Enable noconditionaltask and set the size of hive.auto.convert.join.noconditionaltask.size
--- to 200, which is large enough to fit two small tables. We will have two jobs to evaluate this
--- query. The first job is a Map-only job to evaluate join1 and join2.
--- The second job will evaluate the rest of this query.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1467,11 +1445,7 @@ FROM (SELECT join2.key1 as key1,
       JOIN smallTbl3 ON (join2.key2 = smallTbl3.key)) join3
 JOIN smallTbl4 ON (join3.key3 = smallTbl4.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Enable noconditionaltask and set the size of hive.auto.convert.join.noconditionaltask.size
--- to 200, which is large enough to fit two small tables. We will have two jobs to evaluate this
--- query. The first job is a Map-only job to evaluate join1 and join2.
--- The second job will evaluate the rest of this query.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1773,9 +1747,7 @@ POSTHOOK: Input: default@smalltbl4
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 247580	247580	247580	247580	247580	247580	548662743780	548662743780
-PREHOOK: query: -- Enable noconditionaltask and but set the size of hive.auto.convert.join.noconditionaltask.size
--- to 0. The plan will be the same as the one with a disabled nonconditionaltask.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),
@@ -1808,9 +1780,7 @@ FROM (SELECT join2.key1 as key1,
       JOIN smallTbl3 ON (join2.key2 = smallTbl3.key)) join3
 JOIN smallTbl4 ON (join3.key3 = smallTbl4.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Enable noconditionaltask and but set the size of hive.auto.convert.join.noconditionaltask.size
--- to 0. The plan will be the same as the one with a disabled nonconditionaltask.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT SUM(HASH(join3.key1)),
        SUM(HASH(join3.key2)),
        SUM(HASH(join3.key3)),

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
index ae47be1..e77d194 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
@@ -1,13 +1,11 @@
-PREHOOK: query: -- we will generate one MR job.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
       UNION ALL
       SELECT x2.key AS key FROM src x2 JOIN src1 y2 ON (x2.key = y2.key)) tmp
 ORDER BY tmp.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- we will generate one MR job.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
       UNION ALL
@@ -238,28 +236,14 @@ RUN: Stage-1:MAPRED
 98
 98
 98
-PREHOOK: query: -- Check if the total size of local tables will be
--- larger than the limit that
--- we set through hive.auto.convert.join.noconditionaltask.size (right now, it is
--- 400 bytes). If so, do not merge.
--- For this query, we will merge the MapJoin of x2 and y2 into the MR job
--- for UNION ALL and ORDER BY. But, the MapJoin of x1 and y2 will not be merged
--- into that MR job.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
       UNION ALL
       SELECT x2.key AS key FROM src x2 JOIN src1 y2 ON (x2.key = y2.key)) tmp
 ORDER BY tmp.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Check if the total size of local tables will be
--- larger than the limit that
--- we set through hive.auto.convert.join.noconditionaltask.size (right now, it is
--- 400 bytes). If so, do not merge.
--- For this query, we will merge the MapJoin of x2 and y2 into the MR job
--- for UNION ALL and ORDER BY. But, the MapJoin of x1 and y2 will not be merged
--- into that MR job.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
       UNION ALL
@@ -502,22 +486,14 @@ RUN: Stage-1:MAPRED
 98
 98
 98
-PREHOOK: query: -- We will use two jobs.
--- We will generate one MR job for GROUP BY
--- on x1, one MR job for both the MapJoin of x2 and y2, the UNION ALL, and the
--- ORDER BY.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src1 x1 GROUP BY x1.key
       UNION ALL
       SELECT x2.key AS key FROM src x2 JOIN src1 y2 ON (x2.key = y2.key)) tmp
 ORDER BY tmp.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- We will use two jobs.
--- We will generate one MR job for GROUP BY
--- on x1, one MR job for both the MapJoin of x2 and y2, the UNION ALL, and the
--- ORDER BY.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp.key
 FROM (SELECT x1.key AS key FROM src1 x1 GROUP BY x1.key
       UNION ALL
@@ -713,14 +689,7 @@ RUN: Stage-1:MAPRED
 98
 98
 98
-PREHOOK: query: -- When Correlation Optimizer is disabled,
--- we will use 5 jobs.
--- We will generate one MR job to evaluate the sub-query tmp1,
--- one MR job to evaluate the sub-query tmp2,
--- one MR job for the Join of tmp1 and tmp2,
--- one MR job for aggregation on the result of the Join of tmp1 and tmp2,
--- and one MR job for the ORDER BY.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
@@ -732,14 +701,7 @@ ON (tmp1.key = tmp2.key)
 GROUP BY tmp1.key
 ORDER BY key, cnt
 PREHOOK: type: QUERY
-POSTHOOK: query: -- When Correlation Optimizer is disabled,
--- we will use 5 jobs.
--- We will generate one MR job to evaluate the sub-query tmp1,
--- one MR job to evaluate the sub-query tmp2,
--- one MR job for the Join of tmp1 and tmp2,
--- one MR job for aggregation on the result of the Join of tmp1 and tmp2,
--- and one MR job for the ORDER BY.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
@@ -995,11 +957,7 @@ RUN: Stage-1:MAPRED
 406	1
 66	1
 98	1
-PREHOOK: query: -- When Correlation Optimizer is enabled,
--- we will use two jobs. This first MR job will evaluate sub-queries of tmp1, tmp2,
--- the Join of tmp1 and tmp2, and the aggregation on the result of the Join of
--- tmp1 and tmp2. The second job will do the ORDER BY.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
@@ -1011,11 +969,7 @@ ON (tmp1.key = tmp2.key)
 GROUP BY tmp1.key
 ORDER BY key, cnt
 PREHOOK: type: QUERY
-POSTHOOK: query: -- When Correlation Optimizer is enabled,
--- we will use two jobs. This first MR job will evaluate sub-queries of tmp1, tmp2,
--- the Join of tmp1 and tmp2, and the aggregation on the result of the Join of
--- tmp1 and tmp2. The second job will do the ORDER BY.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src x1 JOIN src1 y1 ON (x1.key = y1.key)
@@ -1271,14 +1225,7 @@ RUN: Stage-1:MAPRED
 406	1
 66	1
 98	1
-PREHOOK: query: -- When Correlation Optimizer is disabled,
--- we will use five jobs.
--- We will generate one MR job to evaluate the sub-query tmp1,
--- one MR job to evaluate the sub-query tmp2,
--- one MR job for the Join of tmp1 and tmp2,
--- one MR job for aggregation on the result of the Join of tmp1 and tmp2,
--- and one MR job for the ORDER BY.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src1 x1
@@ -1290,14 +1237,7 @@ ON (tmp1.key = tmp2.key)
 GROUP BY tmp1.key
 ORDER BY key, cnt
 PREHOOK: type: QUERY
-POSTHOOK: query: -- When Correlation Optimizer is disabled,
--- we will use five jobs.
--- We will generate one MR job to evaluate the sub-query tmp1,
--- one MR job to evaluate the sub-query tmp2,
--- one MR job for the Join of tmp1 and tmp2,
--- one MR job for aggregation on the result of the Join of tmp1 and tmp2,
--- and one MR job for the ORDER BY.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src1 x1
@@ -1519,11 +1459,7 @@ RUN: Stage-1:MAPRED
 406	1
 66	1
 98	1
-PREHOOK: query: -- When Correlation Optimizer is enabled,
--- we will use two job. This first MR job will evaluate sub-queries of tmp1, tmp2,
--- the Join of tmp1 and tmp2, and the aggregation on the result of the Join of
--- tmp1 and tmp2. The second job will do the ORDER BY.
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src1 x1
@@ -1535,11 +1471,7 @@ ON (tmp1.key = tmp2.key)
 GROUP BY tmp1.key
 ORDER BY key, cnt
 PREHOOK: type: QUERY
-POSTHOOK: query: -- When Correlation Optimizer is enabled,
--- we will use two job. This first MR job will evaluate sub-queries of tmp1, tmp2,
--- the Join of tmp1 and tmp2, and the aggregation on the result of the Join of
--- tmp1 and tmp2. The second job will do the ORDER BY.
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT tmp1.key as key, count(*) as cnt
 FROM (SELECT x1.key AS key
       FROM src1 x1
@@ -1761,13 +1693,11 @@ RUN: Stage-1:MAPRED
 406	1
 66	1
 98	1
-PREHOOK: query: -- Check if we can correctly handle partitioned table.
-CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int)
+PREHOOK: query: CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@part_table
-POSTHOOK: query: -- Check if we can correctly handle partitioned table.
-CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int)
+POSTHOOK: query: CREATE TABLE part_table(key string, value string) PARTITIONED BY (partitionId int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@part_table
@@ -1916,9 +1846,7 @@ POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
 121
-PREHOOK: query: -- HIVE-5891 Alias conflict when merging multiple mapjoin tasks into their common
--- child mapred task
-EXPLAIN   
+PREHOOK: query: EXPLAIN   
 SELECT * FROM (
   SELECT c.key FROM
     (SELECT a.key FROM src a JOIN src b ON a.key=b.key GROUP BY a.key) tmp
@@ -1929,9 +1857,7 @@ SELECT * FROM (
     JOIN src c ON tmp.key=c.key
 ) x
 PREHOOK: type: QUERY
-POSTHOOK: query: -- HIVE-5891 Alias conflict when merging multiple mapjoin tasks into their common
--- child mapred task
-EXPLAIN   
+POSTHOOK: query: EXPLAIN   
 SELECT * FROM (
   SELECT c.key FROM
     (SELECT a.key FROM src a JOIN src b ON a.key=b.key GROUP BY a.key) tmp

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/multi_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_insert.q.out b/ql/src/test/results/clientpositive/llap/multi_insert.q.out
index d8052c6..58fc759 100644
--- a/ql/src/test/results/clientpositive/llap/multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_insert.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table src_multi1 like src
+PREHOOK: query: create table src_multi1 like src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@src_multi1
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table src_multi1 like src
+POSTHOOK: query: create table src_multi1 like src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_multi1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/multi_insert_lateral_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_insert_lateral_view.q.out b/ql/src/test/results/clientpositive/llap/multi_insert_lateral_view.q.out
index eb67a6e..e8a3610 100644
--- a/ql/src/test/results/clientpositive/llap/multi_insert_lateral_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_insert_lateral_view.q.out
@@ -1,13 +1,9 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table src_10 as select * from src limit 10
+PREHOOK: query: create table src_10 as select * from src limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@src_10
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table src_10 as select * from src limit 10
+POSTHOOK: query: create table src_10 as select * from src limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
@@ -38,22 +34,12 @@ POSTHOOK: query: create table src_lv3 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_lv3
-PREHOOK: query: -- 2LV
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-FS[12]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[13]-FS[14]
---             -SEL[8]-UDTF[9]-LVJ[10]
-explain
+PREHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, C lateral view explode(array(key+1, key+2)) A as C
 insert overwrite table src_lv2 select key, C lateral view explode(array(key+3, key+4)) A as C
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2LV
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-FS[12]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[13]-FS[14]
---             -SEL[8]-UDTF[9]-LVJ[10]
-explain
+POSTHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, C lateral view explode(array(key+1, key+2)) A as C
 insert overwrite table src_lv2 select key, C lateral view explode(array(key+3, key+4)) A as C
@@ -268,22 +254,12 @@ POSTHOOK: Input: default@src_lv2
 86	90.0
 98	101.0
 98	102.0
-PREHOOK: query: -- 2(LV+GBY)
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-GBY[12]-RS[13]-GBY[14]-SEL[15]-FS[16]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[17]-GBY[18]-RS[19]-GBY[20]-SEL[21]-FS[22]
---             -SEL[8]-UDTF[9]-LVJ[10]
-explain
+PREHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, sum(C) lateral view explode(array(key+3, key+4)) A as C group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2(LV+GBY)
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-GBY[12]-RS[13]-GBY[14]-SEL[15]-FS[16]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[17]-GBY[18]-RS[19]-GBY[20]-SEL[21]-FS[22]
---             -SEL[8]-UDTF[9]-LVJ[10]
-explain
+POSTHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, sum(C) lateral view explode(array(key+3, key+4)) A as C group by key
@@ -516,23 +492,13 @@ POSTHOOK: Input: default@src_lv2
 484	975.0
 86	179.0
 98	203.0
-PREHOOK: query: -- (LV+GBY) + RS:2GBY
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[6]-GBY[7]-RS[8]-GBY[9]-SEL[10]-FS[11]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -FIL[12]-SEL[13]-RS[14]-FOR[15]-FIL[16]-GBY[17]-SEL[18]-FS[19]
---                                     -FIL[20]-GBY[21]-SEL[22]-FS[23]
-explain
+PREHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, count(value) where key > 200 group by key
 insert overwrite table src_lv3 select key, count(value) where key < 200 group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- (LV+GBY) + RS:2GBY
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[6]-GBY[7]-RS[8]-GBY[9]-SEL[10]-FS[11]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -FIL[12]-SEL[13]-RS[14]-FOR[15]-FIL[16]-GBY[17]-SEL[18]-FS[19]
---                                     -FIL[20]-GBY[21]-SEL[22]-FS[23]
-explain
+POSTHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, count(value) where key > 200 group by key
@@ -783,27 +749,13 @@ POSTHOOK: Input: default@src_lv3
 27	1
 86	1
 98	1
-PREHOOK: query: -- todo: shared distinct columns (should work with hive.optimize.multigroupby.common.distincts)
--- 2(LV+GBY) + RS:2GBY
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-GBY[12]-RS[13]-GBY[14]-SEL[15]-FS[16]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[17]-GBY[18]-RS[19]-GBY[20]-SEL[21]-FS[22]
---             -SEL[8]-UDTF[9]-LVJ[10]
---      -SEL[23]-GBY[24]-RS[25]-GBY[26]-SEL[27]-FS[28]
-explain
+PREHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select C, sum(distinct key) lateral view explode(array(key+1, key+2)) A as C group by C
 insert overwrite table src_lv2 select C, sum(distinct key) lateral view explode(array(key+3, key+4)) A as C group by C
 insert overwrite table src_lv3 select value, sum(distinct key) group by value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- todo: shared distinct columns (should work with hive.optimize.multigroupby.common.distincts)
--- 2(LV+GBY) + RS:2GBY
--- TS[0]-LVF[1]-SEL[2]-LVJ[5]-SEL[11]-GBY[12]-RS[13]-GBY[14]-SEL[15]-FS[16]
---             -SEL[3]-UDTF[4]-LVJ[5]
---      -LVF[6]-SEL[7]-LVJ[10]-SEL[17]-GBY[18]-RS[19]-GBY[20]-SEL[21]-FS[22]
---             -SEL[8]-UDTF[9]-LVJ[10]
---      -SEL[23]-GBY[24]-RS[25]-GBY[26]-SEL[27]-FS[28]
-explain
+POSTHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select C, sum(distinct key) lateral view explode(array(key+1, key+2)) A as C group by C
 insert overwrite table src_lv2 select C, sum(distinct key) lateral view explode(array(key+3, key+4)) A as C group by C
@@ -1149,16 +1101,14 @@ POSTHOOK: query: create table src_lv4 (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_lv4
-PREHOOK: query: -- Common distincts optimization works across non-lateral view queries, but not across lateral view multi inserts
-explain
+PREHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(distinct C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, sum(distinct C) lateral view explode(array(key+3, key+4)) A as C group by key
 insert overwrite table src_lv3 select value, sum(distinct key) where key > 200 group by value
 insert overwrite table src_lv4 select value, sum(distinct key) where key < 200 group by value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Common distincts optimization works across non-lateral view queries, but not across lateral view multi inserts
-explain
+POSTHOOK: query: explain
 from src_10
 insert overwrite table src_lv1 select key, sum(distinct C) lateral view explode(array(key+1, key+2)) A as C group by key
 insert overwrite table src_lv2 select key, sum(distinct C) lateral view explode(array(key+3, key+4)) A as C group by key

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/nonmr_fetch_threshold.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/nonmr_fetch_threshold.q.out b/ql/src/test/results/clientpositive/llap/nonmr_fetch_threshold.q.out
index b45e4db..1441ed0 100644
--- a/ql/src/test/results/clientpositive/llap/nonmr_fetch_threshold.q.out
+++ b/ql/src/test/results/clientpositive/llap/nonmr_fetch_threshold.q.out
@@ -62,11 +62,9 @@ Stage-0
         TableScan [TS_0]
           Output:["key","value"]
 
-PREHOOK: query: -- Scans without limit (should be Fetch task now)
-explain select concat(key, value)  from src
+PREHOOK: query: explain select concat(key, value)  from src
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Scans without limit (should be Fetch task now)
-explain select concat(key, value)  from src
+POSTHOOK: query: explain select concat(key, value)  from src
 POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
@@ -78,11 +76,9 @@ Stage-0
       TableScan [TS_0]
         Output:["key","value"]
 
-PREHOOK: query: -- from HIVE-7397, limit + partition pruning filter
-explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
+PREHOOK: query: explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- from HIVE-7397, limit + partition pruning filter
-explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
+POSTHOOK: query: explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
 POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
@@ -112,11 +108,9 @@ Stage-0
         TableScan [TS_0]
           Output:["key","value"]
 
-PREHOOK: query: -- Scans without limit (should not be Fetch task now)
-explain select concat(key, value)  from src
+PREHOOK: query: explain select concat(key, value)  from src
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Scans without limit (should not be Fetch task now)
-explain select concat(key, value)  from src
+POSTHOOK: query: explain select concat(key, value)  from src
 POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
@@ -131,11 +125,9 @@ Stage-0
           TableScan [TS_0] (rows=500 width=178)
             default@src,src,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
 
-PREHOOK: query: -- Simple Scans without limit (will be  Fetch task now)
-explain select key, value  from src
+PREHOOK: query: explain select key, value  from src
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Simple Scans without limit (will be  Fetch task now)
-explain select key, value  from src
+POSTHOOK: query: explain select key, value  from src
 POSTHOOK: type: QUERY
 Plan optimized by CBO.
 

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
index f56318d..1894f7b 100644
--- a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
+++ b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
@@ -271,12 +271,10 @@ val_145	146.0
 val_146	294.0
 val_149	300.0
 val_15	32.0
-PREHOOK: query: -- deduped RS
-explain
+PREHOOK: query: explain
 select value,avg(key + 1) from src group by value order by value limit 10,20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- deduped RS
-explain
+POSTHOOK: query: explain
 select value,avg(key + 1) from src group by value order by value limit 10,20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -370,12 +368,10 @@ val_145	146.0
 val_146	147.0
 val_149	150.0
 val_15	16.0
-PREHOOK: query: -- distincts
-explain
+PREHOOK: query: explain
 select distinct(cdouble) as dis from alltypesorc order by dis limit 10,20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- distincts
-explain
+POSTHOOK: query: explain
 select distinct(cdouble) as dis from alltypesorc order by dis limit 10,20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -664,12 +660,10 @@ POSTHOOK: Input: default@alltypesorc
 -38	31
 -37	20
 -36	26
-PREHOOK: query: -- multi distinct
-explain
+PREHOOK: query: explain
 select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 10,20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- multi distinct
-explain
+POSTHOOK: query: explain
 select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 10,20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -762,12 +756,10 @@ POSTHOOK: Input: default@alltypesorc
 -38	3	19
 -37	3	27
 -36	3	18
-PREHOOK: query: -- limit zero
-explain
+PREHOOK: query: explain
 select key,value from src order by key limit 0,0
 PREHOOK: type: QUERY
-POSTHOOK: query: -- limit zero
-explain
+POSTHOOK: query: explain
 select key,value from src order by key limit 0,0
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -788,12 +780,10 @@ POSTHOOK: query: select key,value from src order by key limit 0,0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-PREHOOK: query: -- 2MR (applied to last RS)
-explain
+PREHOOK: query: explain
 select value, sum(key) as sum from src group by value order by sum limit 10,20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2MR (applied to last RS)
-explain
+POSTHOOK: query: explain
 select value, sum(key) as sum from src group by value order by sum limit 10,20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -900,12 +890,10 @@ val_54	54.0
 val_57	57.0
 val_64	64.0
 val_65	65.0
-PREHOOK: query: -- map aggregation disabled
-explain
+PREHOOK: query: explain
 select value, sum(key) as sum from src group by value order by value limit 10,20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- map aggregation disabled
-explain
+POSTHOOK: query: explain
 select value, sum(key) as sum from src group by value order by value limit 10,20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -993,12 +981,10 @@ val_145	145.0
 val_146	292.0
 val_149	298.0
 val_15	30.0
-PREHOOK: query: -- flush for order-by
-explain
+PREHOOK: query: explain
 select key,value,value,value,value,value,value,value,value from src order by key limit 30,70
 PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for order-by
-explain
+POSTHOOK: query: explain
 select key,value,value,value,value,value,value,value,value from src order by key limit 30,70
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -1133,12 +1119,10 @@ POSTHOOK: Input: default@src
 187	val_187	val_187	val_187	val_187	val_187	val_187	val_187	val_187
 187	val_187	val_187	val_187	val_187	val_187	val_187	val_187	val_187
 187	val_187	val_187	val_187	val_187	val_187	val_187	val_187	val_187
-PREHOOK: query: -- flush for group-by
-explain
+PREHOOK: query: explain
 select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 30,70
 PREHOOK: type: QUERY
-POSTHOOK: query: -- flush for group-by
-explain
+POSTHOOK: query: explain
 select sum(key) as sum from src group by concat(key,value,value,value,value,value,value,value,value,value) order by sum limit 30,70
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -1292,16 +1276,14 @@ POSTHOOK: Input: default@src
 226.0
 226.0
 228.0
-PREHOOK: query: -- subqueries
-explain
+PREHOOK: query: explain
 select * from
 (select key, count(1) from src group by key order by key limit 10,20) subq
 join
 (select key, count(1) from src group by key limit 20,20) subq2
 on subq.key=subq2.key limit 3,5
 PREHOOK: type: QUERY
-POSTHOOK: query: -- subqueries
-explain
+POSTHOOK: query: explain
 select * from
 (select key, count(1) from src group by key order by key limit 10,20) subq
 join

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
index d9775b5..c01b97d 100644
--- a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
@@ -1,17 +1,7 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- Disable CBO here, because it messes with the cases specifically crafted for the optimizer.
--- Instead, we could improve the optimizer to recognize more cases, e.g. filter before join.
-
-explain extended 
+PREHOOK: query: explain extended 
 select key from src where false
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- Disable CBO here, because it messes with the cases specifically crafted for the optimizer.
--- Instead, we could improve the optimizer to recognize more cases, e.g. filter before join.
-
-explain extended 
+POSTHOOK: query: explain extended 
 select key from src where false
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index 87855fa..91f363b 100644
--- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
@@ -28,9 +28,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/orc_create_people.txt'
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@orc_create_people_staging
-PREHOOK: query: -- non-partitioned table
--- partial scan gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -42,9 +40,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- non-partitioned table
--- partial scan gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -223,8 +219,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -236,8 +231,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -312,9 +306,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- partitioned table
--- partial scan gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -326,9 +318,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- partitioned table
--- partial scan gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -665,8 +655,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -678,8 +667,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -808,9 +796,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- partitioned and bucketed table
--- partial scan gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -825,9 +811,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- partitioned and bucketed table
--- partial scan gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -1167,8 +1151,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -1183,8 +1166,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- auto stats gather
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -1316,10 +1298,7 @@ POSTHOOK: query: drop table orc_create_people
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
-PREHOOK: query: -- create table with partitions containing text and ORC files.
--- ORC files implements StatsProvidingRecordReader but text files does not.
--- So the partition containing text file should not have statistics.
-CREATE TABLE orc_create_people (
+PREHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,
@@ -1331,10 +1310,7 @@ STORED AS orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_people
-POSTHOOK: query: -- create table with partitions containing text and ORC files.
--- ORC files implements StatsProvidingRecordReader but text files does not.
--- So the partition containing text file should not have statistics.
-CREATE TABLE orc_create_people (
+POSTHOOK: query: CREATE TABLE orc_create_people (
   id int,
   first_name string,
   last_name string,

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_create.q.out b/ql/src/test/results/clientpositive/llap/orc_create.q.out
index 40d127c..1ae93c6 100644
--- a/ql/src/test/results/clientpositive/llap/orc_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_create.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-DROP TABLE orc_create
+PREHOOK: query: DROP TABLE orc_create
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-DROP TABLE orc_create
+POSTHOOK: query: DROP TABLE orc_create
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: DROP TABLE orc_create_complex
 PREHOOK: type: DROPTABLE
@@ -506,28 +502,24 @@ POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).id SIMPLE [(orc_create_
 POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).last_name SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:last_name, type:string, comment:null), ]
 POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).salary SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:salary, type:decimal(10,0), comment:null), ]
 POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ]
-PREHOOK: query: -- test predicate push down with partition pruning
-SELECT COUNT(*) FROM orc_create_people where id < 10 and state = 'Ca'
+PREHOOK: query: SELECT COUNT(*) FROM orc_create_people where id < 10 and state = 'Ca'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_create_people
 PREHOOK: Input: default@orc_create_people@state=Ca
 #### A masked pattern was here ####
-POSTHOOK: query: -- test predicate push down with partition pruning
-SELECT COUNT(*) FROM orc_create_people where id < 10 and state = 'Ca'
+POSTHOOK: query: SELECT COUNT(*) FROM orc_create_people where id < 10 and state = 'Ca'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Input: default@orc_create_people@state=Ca
 #### A masked pattern was here ####
 5
-PREHOOK: query: -- test predicate push down
-SELECT COUNT(*) FROM orc_create_people where id = 50
+PREHOOK: query: SELECT COUNT(*) FROM orc_create_people where id = 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_create_people
 PREHOOK: Input: default@orc_create_people@state=Ca
 PREHOOK: Input: default@orc_create_people@state=Or
 #### A masked pattern was here ####
-POSTHOOK: query: -- test predicate push down
-SELECT COUNT(*) FROM orc_create_people where id = 50
+POSTHOOK: query: SELECT COUNT(*) FROM orc_create_people where id = 50
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Input: default@orc_create_people@state=Ca
@@ -653,29 +645,25 @@ POSTHOOK: Input: default@orc_create_people@state=Ca
 POSTHOOK: Input: default@orc_create_people@state=Or
 #### A masked pattern was here ####
 20
-PREHOOK: query: -- test predicate push down with partition pruning
-SELECT COUNT(*) FROM orc_create_people where salary = 200.00 and state = 'Ca'
+PREHOOK: query: SELECT COUNT(*) FROM orc_create_people where salary = 200.00 and state = 'Ca'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_create_people
 PREHOOK: Input: default@orc_create_people@state=Ca
 #### A masked pattern was here ####
-POSTHOOK: query: -- test predicate push down with partition pruning
-SELECT COUNT(*) FROM orc_create_people where salary = 200.00 and state = 'Ca'
+POSTHOOK: query: SELECT COUNT(*) FROM orc_create_people where salary = 200.00 and state = 'Ca'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Input: default@orc_create_people@state=Ca
 #### A masked pattern was here ####
 5
-PREHOOK: query: -- test predicate push down with no column projection
-SELECT id, first_name, last_name, address
+PREHOOK: query: SELECT id, first_name, last_name, address
   FROM orc_create_people WHERE id > 90
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_create_people
 PREHOOK: Input: default@orc_create_people@state=Ca
 PREHOOK: Input: default@orc_create_people@state=Or
 #### A masked pattern was here ####
-POSTHOOK: query: -- test predicate push down with no column projection
-SELECT id, first_name, last_name, address
+POSTHOOK: query: SELECT id, first_name, last_name, address
   FROM orc_create_people WHERE id > 90
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_people
@@ -692,8 +680,7 @@ POSTHOOK: Input: default@orc_create_people@state=Or
 97	Dana	Carter	814-601 Purus. Av.
 98	Juliet	Battle	Ap #535-1965 Cursus St.
 99	Wynter	Vincent	626-8492 Mollis Avenue
-PREHOOK: query: -- test create with lower case compression method.
-CREATE TABLE orc_create_cprl (id int)
+PREHOOK: query: CREATE TABLE orc_create_cprl (id int)
 PARTITIONED BY (cdate date)
 STORED AS ORC
 TBLPROPERTIES (
@@ -701,8 +688,7 @@ TBLPROPERTIES (
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_create_cprl
-POSTHOOK: query: -- test create with lower case compression method.
-CREATE TABLE orc_create_cprl (id int)
+POSTHOOK: query: CREATE TABLE orc_create_cprl (id int)
 PARTITIONED BY (cdate date)
 STORED AS ORC
 TBLPROPERTIES (

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_llap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap.q.out b/ql/src/test/results/clientpositive/llap/orc_llap.q.out
index abe2a26..2e0cebe 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap.q.out
@@ -122,12 +122,10 @@ POSTHOOK: Lineage: orc_llap_small.cint SIMPLE [(alltypesorc)alltypesorc.FieldSch
 POSTHOOK: Lineage: orc_llap_small.csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ]
 POSTHOOK: Lineage: orc_llap_small.ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ]
 Warning: Map Join MAPJOIN[14][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- Cross join with no projection - do it on small table
-explain
+PREHOOK: query: explain
 select count(1) from orc_llap_small y join orc_llap_small x
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Cross join with no projection - do it on small table
-explain
+POSTHOOK: query: explain
 select count(1) from orc_llap_small y join orc_llap_small x
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -214,34 +212,28 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_llap_small
 #### A masked pattern was here ####
 225
-PREHOOK: query: -- All row groups selected, no projection
-select count(*) from orc_llap_small
+PREHOOK: query: select count(*) from orc_llap_small
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_llap_small
 #### A masked pattern was here ####
-POSTHOOK: query: -- All row groups selected, no projection
-select count(*) from orc_llap_small
+POSTHOOK: query: select count(*) from orc_llap_small
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_llap_small
 #### A masked pattern was here ####
 15
-PREHOOK: query: -- All row groups pruned
-select count(*) from orc_llap_small where cint < 60000000
+PREHOOK: query: select count(*) from orc_llap_small where cint < 60000000
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_llap_small
 #### A masked pattern was here ####
-POSTHOOK: query: -- All row groups pruned
-select count(*) from orc_llap_small where cint < 60000000
+POSTHOOK: query: select count(*) from orc_llap_small where cint < 60000000
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_llap_small
 #### A masked pattern was here ####
 0
-PREHOOK: query: -- Hash cannot be vectorized, but now we have row-by-row reader, so the subquery runs in llap but with row-by-row reader
-explain
+PREHOOK: query: explain
 select sum(hash(*)) from (select cint, csmallint, cbigint from orc_llap where cint > 10 and cbigint is not null) t
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Hash cannot be vectorized, but now we have row-by-row reader, so the subquery runs in llap but with row-by-row reader
-explain
+POSTHOOK: query: explain
 select sum(hash(*)) from (select cint, csmallint, cbigint from orc_llap where cint > 10 and cbigint is not null) t
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -669,16 +661,14 @@ POSTHOOK: Input: default@orc_llap
 #### A masked pattern was here ####
 -735462183586256
 Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Map 1' is a cross product
-PREHOOK: query: -- multi-stripe test
-insert into table orc_llap
+PREHOOK: query: insert into table orc_llap
 select ctinyint + i, csmallint + i, cint + i, cbigint + i, cfloat + i, cdouble + i, cstring1, cstring2, ctimestamp1, ctimestamp2, cboolean1, cboolean2
 from alltypesorc cross join cross_numbers
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@cross_numbers
 PREHOOK: Output: default@orc_llap
-POSTHOOK: query: -- multi-stripe test
-insert into table orc_llap
+POSTHOOK: query: insert into table orc_llap
 select ctinyint + i, csmallint + i, cint + i, cbigint + i, cfloat + i, cdouble + i, cstring1, cstring2, ctimestamp1, ctimestamp2, cboolean1, cboolean2
 from alltypesorc cross join cross_numbers
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
index 5143a6a..a8ab854 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge11.q.out
@@ -253,8 +253,7 @@ ________________________________________________________________________________
 
 -- END ORC FILE DUMP --
 2	foo	0.8	1	1969-12-31 16:00:00
-PREHOOK: query: -- concatenate
-ALTER TABLE  orcfile_merge1 CONCATENATE
+PREHOOK: query: ALTER TABLE  orcfile_merge1 CONCATENATE
 PREHOOK: type: ALTER_TABLE_MERGE
 PREHOOK: Input: default@orcfile_merge1
 PREHOOK: Output: default@orcfile_merge1
@@ -265,8 +264,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_split_elim
 #### A masked pattern was here ####
 50000
-PREHOOK: query: -- will have double the number of rows
-select count(*) from orcfile_merge1
+PREHOOK: query: select count(*) from orcfile_merge1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
index 18ccba0..47096bb 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_merge5
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_merge5
@@ -26,11 +22,9 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@orc_merge5
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+PREHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+POSTHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -96,13 +90,11 @@ POSTHOOK: Lineage: orc_merge5b.string1 SIMPLE [(orc_merge5)orc_merge5.FieldSchem
 POSTHOOK: Lineage: orc_merge5b.subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
 POSTHOOK: Lineage: orc_merge5b.ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 3 files total
-analyze table orc_merge5b compute statistics noscan
+PREHOOK: query: analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
-POSTHOOK: query: -- 3 files total
-analyze table orc_merge5b compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
@@ -119,11 +111,9 @@ POSTHOOK: Input: default@orc_merge5b
 13	bar	80.0	2	1969-12-31 16:00:05
 2	foo	0.8	1	1969-12-31 16:00:00
 5	eat	0.8	6	1969-12-31 16:00:20
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+PREHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+POSTHOOK: query: explain insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -231,13 +221,11 @@ POSTHOOK: Lineage: orc_merge5b.string1 SIMPLE [(orc_merge5)orc_merge5.FieldSchem
 POSTHOOK: Lineage: orc_merge5b.subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
 POSTHOOK: Lineage: orc_merge5b.ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5b compute statistics noscan
+PREHOOK: query: analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5b compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
@@ -321,13 +309,11 @@ POSTHOOK: query: alter table orc_merge5b concatenate
 POSTHOOK: type: ALTER_TABLE_MERGE
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5b compute statistics noscan
+PREHOOK: query: analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5b compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
index b38bffc..3969a96 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
@@ -1,14 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc file merge tests for static partitions
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+PREHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_merge5
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- orc file merge tests for static partitions
-create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
+POSTHOOK: query: create table orc_merge5 (userid bigint, string1 string, subtype double, decimal1 decimal, ts timestamp) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_merge5
@@ -28,11 +22,9 @@ POSTHOOK: query: load data local inpath '../../data/files/orc_split_elim.orc' in
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@orc_merge5
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+PREHOOK: query: explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+POSTHOOK: query: explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -114,14 +106,12 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).string1 SIMPLE [(orc
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 3 files total
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
-POSTHOOK: query: -- 3 files total
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
@@ -166,11 +156,9 @@ POSTHOOK: Input: default@orc_merge5a@year=2001/hour=24
 2	foo	0.8	1	1969-12-31 16:00:00	2001	24
 5	eat	0.8	6	1969-12-31 16:00:20	2000	24
 5	eat	0.8	6	1969-12-31 16:00:20	2001	24
-PREHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+PREHOOK: query: explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 3 mappers
-explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
+POSTHOOK: query: explain insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -294,14 +282,12 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).string1 SIMPLE [(orc
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).subtype SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:subtype, type:double, comment:null), ]
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:ts, type:timestamp, comment:null), ]
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
@@ -466,14 +452,12 @@ POSTHOOK: query: alter table orc_merge5a partition(year="2001",hour=24) concaten
 POSTHOOK: type: ALTER_PARTITION_MERGE
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
-PREHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
-POSTHOOK: query: -- 1 file after merging
-analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
+POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a