Repository: hive
Updated Branches:
  refs/heads/master d357f3852 -> ef33237da


http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorization_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_limit.q.out 
b/ql/src/test/results/clientpositive/vectorization_limit.q.out
index eb2a692..39ea939 100644
--- a/ql/src/test/results/clientpositive/vectorization_limit.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_limit.q.out
@@ -55,14 +55,10 @@ POSTHOOK: Input: default@alltypesorc
 -1887561756    -8881.0
 -1887561756    -2281.0
 -1887561756    9531.0
-PREHOOK: query: -- HIVE-3562 Some limit can be pushed down to map stage - c/p 
parts from limit_pushdown
-
-explain
+PREHOOK: query: explain
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null 
order by ctinyint,cdouble limit 20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- HIVE-3562 Some limit can be pushed down to map stage - c/p 
parts from limit_pushdown
-
-explain
+POSTHOOK: query: explain
 select ctinyint,cdouble,csmallint from alltypesorc where ctinyint is not null 
order by ctinyint,cdouble limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -140,12 +136,10 @@ POSTHOOK: Input: default@alltypesorc
 -64    -2919.0 -2919
 -64    -1600.0 -1600
 -64    -200.0  -200
-PREHOOK: query: -- deduped RS
-explain
+PREHOOK: query: explain
 select ctinyint,avg(cdouble + 1) from alltypesorc group by ctinyint order by 
ctinyint limit 20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- deduped RS
-explain
+POSTHOOK: query: explain
 select ctinyint,avg(cdouble + 1) from alltypesorc group by ctinyint order by 
ctinyint limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -229,12 +223,10 @@ NULL      9370.0945309795
 -48    1672.909090909091
 -47    -574.6428571428571
 -46    3033.55
-PREHOOK: query: -- distincts
-explain
+PREHOOK: query: explain
 select distinct(ctinyint) from alltypesorc limit 20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- distincts
-explain
+POSTHOOK: query: explain
 select distinct(ctinyint) from alltypesorc limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -401,12 +393,10 @@ NULL      2932
 -48    29
 -47    22
 -46    24
-PREHOOK: query: -- limit zero
-explain
+PREHOOK: query: explain
 select ctinyint,cdouble from alltypesorc order by ctinyint limit 0
 PREHOOK: type: QUERY
-POSTHOOK: query: -- limit zero
-explain
+POSTHOOK: query: explain
 select ctinyint,cdouble from alltypesorc order by ctinyint limit 0
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -427,12 +417,10 @@ POSTHOOK: query: select ctinyint,cdouble from alltypesorc 
order by ctinyint limi
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-PREHOOK: query: -- 2MR (applied to last RS)
-explain
+PREHOOK: query: explain
 select cdouble, sum(ctinyint) as sum from alltypesorc where ctinyint is not 
null group by cdouble order by sum, cdouble limit 20
 PREHOOK: type: QUERY
-POSTHOOK: query: -- 2MR (applied to last RS)
-explain
+POSTHOOK: query: explain
 select cdouble, sum(ctinyint) as sum from alltypesorc where ctinyint is not 
null group by cdouble order by sum, cdouble limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out 
b/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
index d68f343..616599b 100644
--- a/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
@@ -210,20 +210,10 @@ POSTHOOK: Input: default@vsmb_bucket_rc
 528534767      cvLH6Eat2yFsyy7p        528534767       cvLH6Eat2yFsyy7p
 528534767      cvLH6Eat2yFsyy7p        528534767       cvLH6Eat2yFsyy7p
 528534767      cvLH6Eat2yFsyy7p        528534767       cvLH6Eat2yFsyy7p
-PREHOOK: query: -- RC file does not yet provide the vectorized 
CommonRCFileformat out-of-the-box
--- explain
--- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on 
a.key = b.key;
--- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on 
a.key = b.key;
-
-explain
+PREHOOK: query: explain
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_TXT b on a.key 
= b.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- RC file does not yet provide the vectorized 
CommonRCFileformat out-of-the-box
--- explain
--- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on 
a.key = b.key;
--- select /*+MAPJOIN(b)*/ * from vsmb_bucket_RC a join vsmb_bucket_2 b on 
a.key = b.key;
-
-explain
+POSTHOOK: query: explain
 select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_TXT 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/vectorized_date_funcs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_date_funcs.q.out 
b/ql/src/test/results/clientpositive/vectorized_date_funcs.q.out
index f062093..748580f 100644
--- a/ql/src/test/results/clientpositive/vectorized_date_funcs.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_date_funcs.q.out
@@ -1,8 +1,4 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
--- Test timestamp functions in vectorized mode to verify they run correctly 
end-to-end.
-
-CREATE TABLE date_udf_flight (
+PREHOOK: query: CREATE TABLE date_udf_flight (
   origin_city_name STRING,
   dest_city_name STRING,
   fl_date DATE,
@@ -12,11 +8,7 @@ CREATE TABLE date_udf_flight (
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@date_udf_flight
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
--- Test timestamp functions in vectorized mode to verify they run correctly 
end-to-end.
-
-CREATE TABLE date_udf_flight (
+POSTHOOK: query: CREATE TABLE date_udf_flight (
   origin_city_name STRING,
   dest_city_name STRING,
   fl_date DATE,
@@ -816,8 +808,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- Should all be true or NULL
-SELECT
+PREHOOK: query: SELECT
   fl_time,
   fl_date,
   year(fl_time) = year(fl_date),
@@ -844,8 +835,7 @@ FROM date_udf_flight_orc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@date_udf_flight_orc
 #### A masked pattern was here ####
-POSTHOOK: query: -- Should all be true or NULL
-SELECT
+POSTHOOK: query: SELECT
   fl_time,
   fl_date,
   year(fl_time) = year(fl_date),
@@ -1095,13 +1085,11 @@ fl_date _c1     _c2     _c3     _c4     _c5
 2010-10-20     2010-10-22      2010-10-18      -2      2       4
 2010-10-21     2010-10-23      2010-10-19      -2      2       4
 2010-10-21     2010-10-23      2010-10-19      -2      2       4
-PREHOOK: query: -- Test extracting the date part of expression that includes 
time
-SELECT to_date('2009-07-30 04:17:52') FROM date_udf_flight_orc LIMIT 1
+PREHOOK: query: SELECT to_date('2009-07-30 04:17:52') FROM date_udf_flight_orc 
LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@date_udf_flight_orc
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test extracting the date part of expression that includes 
time
-SELECT to_date('2009-07-30 04:17:52') FROM date_udf_flight_orc LIMIT 1
+POSTHOOK: query: SELECT to_date('2009-07-30 04:17:52') FROM 
date_udf_flight_orc LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@date_udf_flight_orc
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out 
b/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
index b414551..a11e058 100644
--- a/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint)
+PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), 
AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint)
+POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), 
AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out 
b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
index f493102..9d6bf0c 100644
--- a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out
@@ -6,8 +6,7 @@ PREHOOK: query: DROP TABLE parquet_types
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE parquet_types
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: -- init
-CREATE TABLE parquet_types_staging (
+PREHOOK: query: CREATE TABLE parquet_types_staging (
   cint int,
   ctinyint tinyint,
   csmallint smallint,
@@ -30,8 +29,7 @@ MAP KEYS TERMINATED BY ':'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@parquet_types_staging
-POSTHOOK: query: -- init
-CREATE TABLE parquet_types_staging (
+POSTHOOK: query: CREATE TABLE parquet_types_staging (
   cint int,
   ctinyint tinyint,
   csmallint smallint,
@@ -117,13 +115,11 @@ POSTHOOK: Lineage: parquet_types.cstring1 SIMPLE 
[(parquet_types_staging)parquet
 POSTHOOK: Lineage: parquet_types.ctinyint SIMPLE 
[(parquet_types_staging)parquet_types_staging.FieldSchema(name:ctinyint, 
type:tinyint, comment:null), ]
 POSTHOOK: Lineage: parquet_types.cvarchar SIMPLE 
[(parquet_types_staging)parquet_types_staging.FieldSchema(name:cvarchar, 
type:varchar(10), comment:null), ]
 POSTHOOK: Lineage: parquet_types.t SIMPLE 
[(parquet_types_staging)parquet_types_staging.FieldSchema(name:t, 
type:timestamp, comment:null), ]
-PREHOOK: query: -- select
-explain
+PREHOOK: query: explain
 SELECT cint, ctinyint, csmallint, cfloat, cdouble, cstring1, t, cchar, 
cvarchar,
 hex(cbinary), cdecimal FROM parquet_types
 PREHOOK: type: QUERY
-POSTHOOK: query: -- select
-explain
+POSTHOOK: query: explain
 SELECT cint, ctinyint, csmallint, cfloat, cdouble, cstring1, t, cchar, 
cvarchar,
 hex(cbinary), cdecimal FROM parquet_types
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out 
b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
index c35173e..c4cf9aa 100644
--- a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
@@ -1,7 +1,4 @@
-PREHOOK: query: --This query must pass even when vectorized reader is not 
available for
---RC files. The query must fall back to the non-vector mode and run 
successfully.
-
-CREATE table columnTable (key STRING, value STRING)
+PREHOOK: query: CREATE table columnTable (key STRING, value STRING)
 ROW FORMAT SERDE
   'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
 STORED AS
@@ -10,10 +7,7 @@ STORED AS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@columnTable
-POSTHOOK: query: --This query must pass even when vectorized reader is not 
available for
---RC files. The query must fall back to the non-vector mode and run 
successfully.
-
-CREATE table columnTable (key STRING, value STRING)
+POSTHOOK: query: CREATE table columnTable (key STRING, value STRING)
 ROW FORMAT SERDE
   'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
 STORED AS

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out 
b/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
index cd05fd8..992a1ef 100644
--- a/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
@@ -1,12 +1,8 @@
-PREHOOK: query: -- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , MIN(t1.cint), 
AVG(t1.cint+t2.cint)
+PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , 
MIN(t1.cint), AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_QUERY_RESULTS
-
-EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , MIN(t1.cint), 
AVG(t1.cint+t2.cint)
+POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , 
MIN(t1.cint), AVG(t1.cint+t2.cint)
   FROM alltypesorc t1
   JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out 
b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
index 58af3e2..03c5ee4 100644
--- a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
@@ -1,18 +1,8 @@
-PREHOOK: query: -- Test timestamp functions in vectorized mode to verify they 
run correctly end-to-end.
--- Turning on vectorization has been temporarily moved after filling the test 
table
--- due to bug HIVE-8197.
-
-
-CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) 
STORED AS ORC
+PREHOOK: query: CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, 
stimestamp1 string) STORED AS ORC
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@alltypesorc_string
-POSTHOOK: query: -- Test timestamp functions in vectorized mode to verify they 
run correctly end-to-end.
--- Turning on vectorization has been temporarily moved after filling the test 
table
--- due to bug HIVE-8197.
-
-
-CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) 
STORED AS ORC
+POSTHOOK: query: CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, 
stimestamp1 string) STORED AS ORC
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@alltypesorc_string
@@ -411,8 +401,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: -- Should all be true or NULL
-SELECT
+PREHOOK: query: SELECT
   to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1,
   year(ctimestamp1) = year(stimestamp1),
   month(ctimestamp1) = month(stimestamp1),
@@ -427,8 +416,7 @@ ORDER BY c1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
-POSTHOOK: query: -- Should all be true or NULL
-SELECT
+POSTHOOK: query: SELECT
   to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1,
   year(ctimestamp1) = year(stimestamp1),
   month(ctimestamp1) = month(stimestamp1),
@@ -483,8 +471,7 @@ NULL        NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
 NULL   NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL
-PREHOOK: query: -- Wrong format. Should all be NULL.
-EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   to_unix_timestamp(stimestamp1) AS c1,
   year(stimestamp1),
   month(stimestamp1),
@@ -497,8 +484,7 @@ EXPLAIN SELECT
 FROM alltypesorc_wrong
 ORDER BY c1
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Wrong format. Should all be NULL.
-EXPLAIN SELECT
+POSTHOOK: query: EXPLAIN SELECT
   to_unix_timestamp(stimestamp1) AS c1,
   year(stimestamp1),
   month(stimestamp1),
@@ -662,13 +648,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_string
 #### A masked pattern was here ####
 NULL   NULL    0       40
-PREHOOK: query: -- SUM of timestamps are not vectorized reduce-side because 
they produce a double instead of a long (HIVE-8211)...
-EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   round(sum(ctimestamp1), 3)
 FROM alltypesorc_string
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SUM of timestamps are not vectorized reduce-side because 
they produce a double instead of a long (HIVE-8211)...
-EXPLAIN SELECT
+POSTHOOK: query: EXPLAIN SELECT
   round(sum(ctimestamp1), 3)
 FROM alltypesorc_string
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/view.q.out 
b/ql/src/test/results/clientpositive/view.q.out
index c7505b8..9896d18 100644
--- a/ql/src/test/results/clientpositive/view.q.out
+++ b/ql/src/test/results/clientpositive/view.q.out
@@ -50,102 +50,86 @@ OVERWRITE INTO TABLE table2
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: db1@table2
-PREHOOK: query: -- relative reference, no alias
-CREATE VIEW v1 AS SELECT * FROM table1
+PREHOOK: query: CREATE VIEW v1 AS SELECT * FROM table1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v1
-POSTHOOK: query: -- relative reference, no alias
-CREATE VIEW v1 AS SELECT * FROM table1
+POSTHOOK: query: CREATE VIEW v1 AS SELECT * FROM table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v1
-PREHOOK: query: -- relative reference, aliased
-CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
+PREHOOK: query: CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v2
-POSTHOOK: query: -- relative reference, aliased
-CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
+POSTHOOK: query: CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v2
-PREHOOK: query: -- relative reference, multiple tables
-CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON 
t1.key = t2.key
+PREHOOK: query: CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN 
table2 t2 ON t1.key = t2.key
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Input: db1@table2
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v3
-POSTHOOK: query: -- relative reference, multiple tables
-CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON 
t1.key = t2.key
+POSTHOOK: query: CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN 
table2 t2 ON t1.key = t2.key
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Input: db1@table2
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v3
-PREHOOK: query: -- absolute reference, no alias
-CREATE VIEW v4 AS SELECT * FROM db1.table1
+PREHOOK: query: CREATE VIEW v4 AS SELECT * FROM db1.table1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v4
-POSTHOOK: query: -- absolute reference, no alias
-CREATE VIEW v4 AS SELECT * FROM db1.table1
+POSTHOOK: query: CREATE VIEW v4 AS SELECT * FROM db1.table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v4
-PREHOOK: query: -- absolute reference, aliased
-CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
+PREHOOK: query: CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v5
-POSTHOOK: query: -- absolute reference, aliased
-CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
+POSTHOOK: query: CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v5
-PREHOOK: query: -- absolute reference, multiple tables
-CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 
ON t1.key = t2.key
+PREHOOK: query: CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 
JOIN db1.table2 t2 ON t1.key = t2.key
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Input: db1@table2
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v6
-POSTHOOK: query: -- absolute reference, multiple tables
-CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 
ON t1.key = t2.key
+POSTHOOK: query: CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 
JOIN db1.table2 t2 ON t1.key = t2.key
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Input: db1@table2
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v6
-PREHOOK: query: -- relative reference, explicit column
-CREATE VIEW v7 AS SELECT key from table1
+PREHOOK: query: CREATE VIEW v7 AS SELECT key from table1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v7
-POSTHOOK: query: -- relative reference, explicit column
-CREATE VIEW v7 AS SELECT key from table1
+POSTHOOK: query: CREATE VIEW v7 AS SELECT key from table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1
 POSTHOOK: Output: db1@v7
-PREHOOK: query: -- absolute reference, explicit column
-CREATE VIEW v8 AS SELECT key from db1.table1
+PREHOOK: query: CREATE VIEW v8 AS SELECT key from db1.table1
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: db1@table1
 PREHOOK: Output: database:db1
 PREHOOK: Output: db1@v8
-POSTHOOK: query: -- absolute reference, explicit column
-CREATE VIEW v8 AS SELECT key from db1.table1
+POSTHOOK: query: CREATE VIEW v8 AS SELECT key from db1.table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: db1@table1
 POSTHOOK: Output: database:db1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/view_inputs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/view_inputs.q.out 
b/ql/src/test/results/clientpositive/view_inputs.q.out
index e9160f3..aa52b33 100644
--- a/ql/src/test/results/clientpositive/view_inputs.q.out
+++ b/ql/src/test/results/clientpositive/view_inputs.q.out
@@ -1,13 +1,9 @@
-PREHOOK: query: -- Tests that selecting from a view and another view that 
selects from that same view
-
-CREATE VIEW test_view1 AS SELECT * FROM src
+PREHOOK: query: CREATE VIEW test_view1 AS SELECT * FROM src
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@test_view1
-POSTHOOK: query: -- Tests that selecting from a view and another view that 
selects from that same view
-
-CREATE VIEW test_view1 AS SELECT * FROM src
+POSTHOOK: query: CREATE VIEW test_view1 AS SELECT * FROM src
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_columnPruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_columnPruning.q.out 
b/ql/src/test/results/clientpositive/windowing_columnPruning.q.out
index a684f56..73e43b3 100644
--- a/ql/src/test/results/clientpositive/windowing_columnPruning.q.out
+++ b/ql/src/test/results/clientpositive/windowing_columnPruning.q.out
@@ -1,12 +1,10 @@
-PREHOOK: query: -- 1. testQueryLevelPartitionColsNotInSelect
-select p_size,
+PREHOOK: query: select p_size,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. testQueryLevelPartitionColsNotInSelect
-select p_size,
+POSTHOOK: query: select p_size,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 POSTHOOK: type: QUERY
@@ -38,15 +36,13 @@ POSTHOOK: Input: default@part
 2      5190.08
 46     6208.18
 23     7672.66
-PREHOOK: query: -- 2. testWindowPartitionColsNotInSelect
-select p_size,
+PREHOOK: query: select p_size,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. testWindowPartitionColsNotInSelect
-select p_size,
+POSTHOOK: query: select p_size,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 POSTHOOK: type: QUERY
@@ -78,15 +74,13 @@ POSTHOOK: Input: default@part
 2      5190.08
 46     6208.18
 23     7672.66
-PREHOOK: query: -- 3. testHavingColNotInSelect
-select p_mfgr,
+PREHOOK: query: select p_mfgr,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3. testHavingColNotInSelect
-select p_mfgr,
+POSTHOOK: query: select p_mfgr,
 sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
unbounded preceding and current row) as s1
 from part
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_distinct.q.out 
b/ql/src/test/results/clientpositive/windowing_distinct.q.out
index 86d1cdd..4c0c2d2 100644
--- a/ql/src/test/results/clientpositive/windowing_distinct.q.out
+++ b/ql/src/test/results/clientpositive/windowing_distinct.q.out
@@ -128,16 +128,14 @@ POSTHOOK: Input: default@windowing_distinct
 117.5  38.71   NULL    NULL    1.362157918703306E9     34.5000
 117.5  38.71   NULL    NULL    1.362157918703306E9     34.5000
 117.5  38.71   NULL    NULL    1.362157918703306E9     34.5000
-PREHOOK: query: -- count
-select index, f, count(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+PREHOOK: query: select index, f, count(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  count(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  count(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  count(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct
 PREHOOK: type: QUERY
 PREHOOK: Input: default@windowing_distinct
 #### A masked pattern was here ####
-POSTHOOK: query: -- count
-select index, f, count(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+POSTHOOK: query: select index, f, count(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  count(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  count(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  count(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct
@@ -150,16 +148,14 @@ POSTHOOK: Input: default@windowing_distinct
 2      13.01   0       0       1       2
 2      74.72   1       1       1       2
 2      74.72   2       2       0       2
-PREHOOK: query: -- sum
-select index, f, sum(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+PREHOOK: query: select index, f, sum(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  sum(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  sum(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  sum(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct
 PREHOOK: type: QUERY
 PREHOOK: Input: default@windowing_distinct
 #### A masked pattern was here ####
-POSTHOOK: query: -- sum
-select index, f, sum(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+POSTHOOK: query: select index, f, sum(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  sum(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  sum(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  sum(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct
@@ -172,16 +168,14 @@ POSTHOOK: Input: default@windowing_distinct
 2      13.01   NULL    NULL    74.72000122070312       87.73000144958496
 2      74.72   13.010000228881836      13.010000228881836      
74.72000122070312       87.73000144958496
 2      74.72   87.73000144958496       87.73000144958496       NULL    
87.73000144958496
-PREHOOK: query: -- avg
-select index, f, avg(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+PREHOOK: query: select index, f, avg(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  avg(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  avg(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  avg(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct
 PREHOOK: type: QUERY
 PREHOOK: Input: default@windowing_distinct
 #### A masked pattern was here ####
-POSTHOOK: query: -- avg
-select index, f, avg(distinct f) over (partition by index order by f rows 
between 2 preceding and 1 preceding),
+POSTHOOK: query: select index, f, avg(distinct f) over (partition by index 
order by f rows between 2 preceding and 1 preceding),
                  avg(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 preceding),
                  avg(distinct f) over (partition by index order by f rows 
between 1 following and 2 following),
                  avg(distinct f) over (partition by index order by f rows 
between unbounded preceding and 1 following) from windowing_distinct

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_expressions.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_expressions.q.out 
b/ql/src/test/results/clientpositive/windowing_expressions.q.out
index c91403b..b3545d5 100644
--- a/ql/src/test/results/clientpositive/windowing_expressions.q.out
+++ b/ql/src/test/results/clientpositive/windowing_expressions.q.out
@@ -628,13 +628,11 @@ Manufacturer#5    1241.29
 Manufacturer#5 1424.0900000000001
 Manufacturer#5 1515.25
 Manufacturer#5 1534.532
-PREHOOK: query: -- multi table insert test
-create table t1 (a1 int, b1 string)
+PREHOOK: query: create table t1 (a1 int, b1 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: -- multi table insert test
-create table t1 (a1 int, b1 string)
+POSTHOOK: query: create table t1 (a1 int, b1 string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_rank.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_rank.q.out 
b/ql/src/test/results/clientpositive/windowing_rank.q.out
index 67975f3..720281f 100644
--- a/ql/src/test/results/clientpositive/windowing_rank.q.out
+++ b/ql/src/test/results/clientpositive/windowing_rank.q.out
@@ -476,9 +476,7 @@ ulysses steinbeck   0.0
 victor van buren       0.3333333333333333
 sarah carson   0.6666666666666666
 priscilla nixon        1.0
-PREHOOK: query: -- If following tests fail, look for the comments in class 
PTFPPD::process()
-
-select ts, dec, rnk
+PREHOOK: query: select ts, dec, rnk
 from
   (select ts, dec,
           rank() over (partition by ts order by dec)  as rnk
@@ -492,9 +490,7 @@ where rnk =  1 limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k
 #### A masked pattern was here ####
-POSTHOOK: query: -- If following tests fail, look for the comments in class 
PTFPPD::process()
-
-select ts, dec, rnk
+POSTHOOK: query: select ts, dec, rnk
 from
   (select ts, dec,
           rank() over (partition by ts order by dec)  as rnk

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_streaming.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_streaming.q.out 
b/ql/src/test/results/clientpositive/windowing_streaming.q.out
index 701ae40..c0bce0c 100644
--- a/ql/src/test/results/clientpositive/windowing_streaming.q.out
+++ b/ql/src/test/results/clientpositive/windowing_streaming.q.out
@@ -44,13 +44,11 @@ POSTHOOK: query: load data local inpath 
'../../data/files/over10k' into table ov
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@over10k
-PREHOOK: query: -- part tests
-explain
+PREHOOK: query: explain
 select * 
 from ( select p_mfgr, rank() over(partition by p_mfgr order by p_name) r from 
part) a
 PREHOOK: type: QUERY
-POSTHOOK: query: -- part tests
-explain
+POSTHOOK: query: explain
 select * 
 from ( select p_mfgr, rank() over(partition by p_mfgr order by p_name) r from 
part) a
 POSTHOOK: type: QUERY
@@ -233,15 +231,13 @@ Manufacturer#2    1
 Manufacturer#3 1
 Manufacturer#4 1
 Manufacturer#5 1
-PREHOOK: query: -- over10k tests
-select * 
+PREHOOK: query: select * 
 from (select t, f, rank() over(partition by t order by f) r from over10k) a 
 where r < 6 and t < 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k
 #### A masked pattern was here ####
-POSTHOOK: query: -- over10k tests
-select * 
+POSTHOOK: query: select * 
 from (select t, f, rank() over(partition by t order by f) r from over10k) a 
 where r < 6 and t < 5
 POSTHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_udaf2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_udaf2.q.out 
b/ql/src/test/results/clientpositive/windowing_udaf2.q.out
index 2498676..f548286 100644
--- a/ql/src/test/results/clientpositive/windowing_udaf2.q.out
+++ b/ql/src/test/results/clientpositive/windowing_udaf2.q.out
@@ -1,9 +1,7 @@
-PREHOOK: query: -- user-added aggregates should be usable as windowing 
functions
-create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
+PREHOOK: query: create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: mysum
-POSTHOOK: query: -- user-added aggregates should be usable as windowing 
functions
-create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
+POSTHOOK: query: create temporary function mysum as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: mysum
 PREHOOK: query: select sum(key) over (), mysum(key) over () from src limit 1

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_windowspec.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_windowspec.q.out 
b/ql/src/test/results/clientpositive/windowing_windowspec.q.out
index 8d78c22..176b2ed 100644
--- a/ql/src/test/results/clientpositive/windowing_windowspec.q.out
+++ b/ql/src/test/results/clientpositive/windowing_windowspec.q.out
@@ -830,13 +830,11 @@ alice allen       65609   20.0
 alice allen    65662   20.0
 alice allen    65670   20.0
 alice allen    65720   20.0
-PREHOOK: query: -- HIVE-9228 
-select s, i from ( select s, i, round((avg(d) over  w1 + 10.0) - (avg(d) over 
w1 - 10.0),2) from over10k window w1 as (partition by s order by i)) X limit 7
+PREHOOK: query: select s, i from ( select s, i, round((avg(d) over  w1 + 10.0) 
- (avg(d) over w1 - 10.0),2) from over10k window w1 as (partition by s order by 
i)) X limit 7
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k
 #### A masked pattern was here ####
-POSTHOOK: query: -- HIVE-9228 
-select s, i from ( select s, i, round((avg(d) over  w1 + 10.0) - (avg(d) over 
w1 - 10.0),2) from over10k window w1 as (partition by s order by i)) X limit 7
+POSTHOOK: query: select s, i from ( select s, i, round((avg(d) over  w1 + 
10.0) - (avg(d) over w1 - 10.0),2) from over10k window w1 as (partition by s 
order by i)) X limit 7
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_windowspec3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_windowspec3.q.out 
b/ql/src/test/results/clientpositive/windowing_windowspec3.q.out
index e311cf9..7defa8c 100644
--- a/ql/src/test/results/clientpositive/windowing_windowspec3.q.out
+++ b/ql/src/test/results/clientpositive/windowing_windowspec3.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: -- Test value based windowing spec
-
-drop table if exists emp
+PREHOOK: query: drop table if exists emp
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- Test value based windowing spec
-
-drop table if exists emp
+POSTHOOK: query: drop table if exists emp
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table emp(empno smallint,
            ename varchar(10),
@@ -44,13 +40,11 @@ POSTHOOK: query: load data local inpath 
'../../data/files/emp2.txt' into table e
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@emp
-PREHOOK: query: -- No order by
-select hirets, salary, sum(salary) over (partition by hirets range between 
current row and unbounded following) from emp
+PREHOOK: query: select hirets, salary, sum(salary) over (partition by hirets 
range between current row and unbounded following) from emp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
 #### A masked pattern was here ####
-POSTHOOK: query: -- No order by
-select hirets, salary, sum(salary) over (partition by hirets range between 
current row and unbounded following) from emp
+POSTHOOK: query: select hirets, salary, sum(salary) over (partition by hirets 
range between current row and unbounded following) from emp
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emp
 #### A masked pattern was here ####
@@ -70,8 +64,7 @@ NULL  1500.0  3000.0
 1982-01-23 00:00:00    1300.0  1300.0
 1982-12-09 00:00:00    3000.0  3000.0
 1983-01-12 00:00:00    1100.0  1100.0
-PREHOOK: query: -- Support date datatype
-select deptno, empno, hiredate, salary,
+PREHOOK: query: select deptno, empno, hiredate, salary,
     sum(salary) over (partition by deptno order by hiredate range 90 
preceding),
     sum(salary) over (partition by deptno order by hiredate range between 90 
preceding and 90 following),
     sum(salary) over (partition by deptno order by hiredate range between 90 
preceding and 10 preceding),
@@ -82,8 +75,7 @@ from emp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
 #### A masked pattern was here ####
-POSTHOOK: query: -- Support date datatype
-select deptno, empno, hiredate, salary,
+POSTHOOK: query: select deptno, empno, hiredate, salary,
     sum(salary) over (partition by deptno order by hiredate range 90 
preceding),
     sum(salary) over (partition by deptno order by hiredate range between 90 
preceding and 90 following),
     sum(salary) over (partition by deptno order by hiredate range between 90 
preceding and 10 preceding),
@@ -110,8 +102,7 @@ POSTHOOK: Input: default@emp
 30     7844    1981-09-08      1500.0  1500.0  3700.0  NULL    2200.0  2200.0  
7200.0
 30     7654    1981-09-28      1250.0  2750.0  3700.0  1500.0  950.0   950.0   
8450.0
 30     7900    1981-12-03      950.0   3700.0  3700.0  2750.0  NULL    NULL    
9400.0
-PREHOOK: query: -- Support timestamp datatype. Value in seconds (90days = 90 * 
24 * 3600 seconds)
-select deptno, empno, hirets, salary,
+PREHOOK: query: select deptno, empno, hirets, salary,
     sum(salary) over (partition by deptno order by hirets range 7776000 
preceding),
     sum(salary) over (partition by deptno order by hirets range between 
7776000 preceding and 7776000 following),
     sum(salary) over (partition by deptno order by hirets range between 
7776000 preceding and 864000 preceding),
@@ -122,8 +113,7 @@ from emp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
 #### A masked pattern was here ####
-POSTHOOK: query: -- Support timestamp datatype. Value in seconds (90days = 90 
* 24 * 3600 seconds)
-select deptno, empno, hirets, salary,
+POSTHOOK: query: select deptno, empno, hirets, salary,
     sum(salary) over (partition by deptno order by hirets range 7776000 
preceding),
     sum(salary) over (partition by deptno order by hirets range between 
7776000 preceding and 7776000 following),
     sum(salary) over (partition by deptno order by hirets range between 
7776000 preceding and 864000 preceding),
@@ -150,8 +140,7 @@ POSTHOOK: Input: default@emp
 30     7844    1981-09-08 00:00:00     1500.0  1500.0  3700.0  NULL    2200.0  
2200.0  7200.0
 30     7654    1981-09-28 00:00:00     1250.0  2750.0  3700.0  1500.0  950.0   
950.0   8450.0
 30     7900    1981-12-03 00:00:00     950.0   3700.0  3700.0  2750.0  NULL    
NULL    9400.0
-PREHOOK: query: -- Support double datatype
-select deptno, empno, bonus,
+PREHOOK: query: select deptno, empno, bonus,
     avg(bonus) over (partition by deptno order by bonus range 200 preceding),
     avg(bonus) over (partition by deptno order by bonus range between 200 
preceding and 200 following),
     avg(bonus) over (partition by deptno order by bonus range between 200 
preceding and 100 preceding),
@@ -162,8 +151,7 @@ from emp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
 #### A masked pattern was here ####
-POSTHOOK: query: -- Support double datatype
-select deptno, empno, bonus,
+POSTHOOK: query: select deptno, empno, bonus,
     avg(bonus) over (partition by deptno order by bonus range 200 preceding),
     avg(bonus) over (partition by deptno order by bonus range between 200 
preceding and 200 following),
     avg(bonus) over (partition by deptno order by bonus range between 200 
preceding and 100 preceding),
@@ -190,8 +178,7 @@ POSTHOOK: Input: default@emp
 30     7499    300.0   300.0   400.0   NULL    500.0   1400.0  
266.6666666666667
 30     7521    500.0   400.0   400.0   300.0   NULL    1400.0  
266.6666666666667
 30     7654    1400.0  1400.0  1400.0  NULL    NULL    NULL    550.0
-PREHOOK: query: -- Support Decimal datatype
-select deptno, empno, stock, salary,
+PREHOOK: query: select deptno, empno, stock, salary,
     avg(salary) over (partition by deptno order by stock range 200 preceding),
     avg(salary) over (partition by deptno order by stock range between 200 
preceding and 200 following),
     avg(salary) over (partition by deptno order by stock range between 200 
preceding and 100 preceding),
@@ -202,8 +189,7 @@ from emp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
 #### A masked pattern was here ####
-POSTHOOK: query: -- Support Decimal datatype
-select deptno, empno, stock, salary,
+POSTHOOK: query: select deptno, empno, stock, salary,
     avg(salary) over (partition by deptno order by stock range 200 preceding),
     avg(salary) over (partition by deptno order by stock range between 200 
preceding and 200 following),
     avg(salary) over (partition by deptno order by stock range between 200 
preceding and 100 preceding),

http://git-wip-us.apache.org/repos/asf/hive/blob/ef33237d/ql/src/test/results/clientpositive/windowing_windowspec4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/windowing_windowspec4.q.out 
b/ql/src/test/results/clientpositive/windowing_windowspec4.q.out
index c7cbb5f..3a498b4 100644
--- a/ql/src/test/results/clientpositive/windowing_windowspec4.q.out
+++ b/ql/src/test/results/clientpositive/windowing_windowspec4.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: --Test small dataset with larger windowing
-
-drop table if exists smalltable_windowing
+PREHOOK: query: drop table if exists smalltable_windowing
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: --Test small dataset with larger windowing
-
-drop table if exists smalltable_windowing
+POSTHOOK: query: drop table if exists smalltable_windowing
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table smalltable_windowing(
       i int,

Reply via email to