hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1465903 [8/13] - in /hive/trunk/ql/src/test: queries/clientpositive/ results/clientpositive/
Date Tue, 09 Apr 2013 06:33:23 GMT
Modified: hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,6 @@
-PREHOOK: query: -- this test verifies that the block merge task that can follow a query to generate dynamic
--- partitions does not produce incorrect results by dropping partitions
-
-create table srcpart_merge_dp like srcpart
+PREHOOK: query: create table srcpart_merge_dp like srcpart
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- this test verifies that the block merge task that can follow a query to generate dynamic
--- partitions does not produce incorrect results by dropping partitions
-
-create table srcpart_merge_dp like srcpart
+POSTHOOK: query: create table srcpart_merge_dp like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@srcpart_merge_dp
 PREHOOK: query: create table srcpart_merge_dp_rc like srcpart

Modified: hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- this is to test the case where some dynamic partitions are merged and some are moved
-
-create table srcpart_merge_dp like srcpart
+PREHOOK: query: create table srcpart_merge_dp like srcpart
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- this is to test the case where some dynamic partitions are merged and some are moved
-
-create table srcpart_merge_dp like srcpart
+POSTHOOK: query: create table srcpart_merge_dp like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@srcpart_merge_dp
 PREHOOK: query: create table srcpart_merge_dp_rc like srcpart

Modified: hive/trunk/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/mergejoins_mixed.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/mergejoins_mixed.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/mergejoins_mixed.q.out Tue Apr  9 06:33:16 2013
@@ -1,18 +1,12 @@
-PREHOOK: query: -- HIVE-3464
-
-create table a (key string, value string)
+PREHOOK: query: create table a (key string, value string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- HIVE-3464
-
-create table a (key string, value string)
+POSTHOOK: query: create table a (key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@a
-PREHOOK: query: -- (a-b-c-d)
-explain
+PREHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.key=c.key) left outer join a d on (a.key=d.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- (a-b-c-d)
-explain
+POSTHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.key=c.key) left outer join a d on (a.key=d.key)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
@@ -525,12 +519,10 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- ((a-b-d)-c) (reordered)
-explain
+PREHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) left outer join a d on (a.key=d.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- ((a-b-d)-c) (reordered)
-explain
+POSTHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) left outer join a d on (a.key=d.key)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
@@ -1037,12 +1029,10 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- (((a-b)-c)-d)
-explain
+PREHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) right outer join a d on (a.key=d.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- (((a-b)-c)-d)
-explain
+POSTHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) right outer join a d on (a.key=d.key)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
@@ -1863,12 +1853,10 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-PREHOOK: query: -- ((a-b)-c-d)
-explain
+PREHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) left outer join a d on (c.key=d.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- ((a-b)-c-d)
-explain
+POSTHOOK: query: explain
 select * from a join a b on (a.key=b.key) left outer join a c on (b.value=c.key) left outer join a d on (c.key=d.key)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:

Modified: hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out Tue Apr  9 06:33:16 2013
@@ -1529,12 +1529,10 @@ POSTHOOK: Input: default@srcpart@ds=2008
 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: Input: 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: Input: default@test2
 POSTHOOK: Output: default@test2@ds=01%3A10%3A10/hr=01

Modified: hive/trunk/ql/src/test/results/clientpositive/multiMapJoin1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/multiMapJoin1.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/multiMapJoin1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/multiMapJoin1.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- Join of a big table with 2 small tables on different keys should be performed as a single MR job
-create table smallTbl1(key string, value string)
+PREHOOK: query: create table smallTbl1(key string, value string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Join of a big table with 2 small tables on different keys should be performed as a single MR job
-create table smallTbl1(key string, value string)
+POSTHOOK: query: create table smallTbl1(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@smallTbl1
 PREHOOK: query: insert overwrite table smallTbl1 select * from src where key < 10
@@ -638,8 +636,7 @@ POSTHOOK: Lineage: smalltbl2.value SIMPL
 POSTHOOK: Lineage: smalltbl3.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: smalltbl3.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 1660
-PREHOOK: query: -- join with 4 tables on different keys is also executed as a single MR job
-explain
+PREHOOK: query: explain
 select count(*) FROM
  (
    SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,
@@ -654,8 +651,7 @@ select count(*) FROM
  ) secondjoin
  JOIN smallTbl3 on (secondjoin.key2 = smallTbl3.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- join with 4 tables on different keys is also executed as a single MR job
-explain
+POSTHOOK: query: explain
 select count(*) FROM
  (
    SELECT firstjoin.key1 as key1, firstjoin.key2 as key2, smallTbl2.key as key3,

Modified: hive/trunk/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- was negative/ambiguous_table_col.q
-
-drop table ambiguous
+PREHOOK: query: drop table ambiguous
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- was negative/ambiguous_table_col.q
-
-drop table ambiguous
+POSTHOOK: query: drop table ambiguous
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table ambiguous (key string, value string)
 PREHOOK: type: CREATETABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- negative, references twice for result of funcion
-explain select nkey, nkey + 1 from (select key + 1 as nkey, value from src) a
+PREHOOK: query: explain select nkey, nkey + 1 from (select key + 1 as nkey, value from src) a
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, references twice for result of funcion
-explain select nkey, nkey + 1 from (select key + 1 as nkey, value from src) a
+POSTHOOK: query: explain select nkey, nkey + 1 from (select key + 1 as nkey, value from src) a
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (+ (TOK_TABLE_OR_COL key) 1) nkey) (TOK_SELEXPR (TOK_TABLE_OR_COL value))))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL nkey)) (TOK_SELEXPR (+ (TOK_TABLE_OR_COL nkey) 1)))))

Modified: hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- backward compatible (minimal)
-explain select * from src limit 10
+PREHOOK: query: explain select * from src limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- backward compatible (minimal)
-explain select * from src limit 10
+POSTHOOK: query: explain select * from src limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 10)))
@@ -98,11 +96,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 278	val_278	2008-04-08	11
 98	val_98	2008-04-08	11
 484	val_484	2008-04-08	11
-PREHOOK: query: -- negative, select expression
-explain select key from src limit 10
+PREHOOK: query: explain select key from src limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, select expression
-explain select key from src limit 10
+POSTHOOK: query: explain select key from src limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key))) (TOK_LIMIT 10)))
@@ -154,11 +150,9 @@ POSTHOOK: Input: default@src
 278
 98
 484
-PREHOOK: query: -- negative, filter on non-partition column
-explain select * from srcpart where key > 100 limit 10
+PREHOOK: query: explain select * from srcpart where key > 100 limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, filter on non-partition column
-explain select * from srcpart where key > 100 limit 10
+POSTHOOK: query: explain select * from srcpart where key > 100 limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (> (TOK_TABLE_OR_COL key) 100)) (TOK_LIMIT 10)))
@@ -228,11 +222,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 265	val_265	2008-04-08	11
 193	val_193	2008-04-08	11
 401	val_401	2008-04-08	11
-PREHOOK: query: -- negative, table sampling
-explain select * from src TABLESAMPLE (0.25 PERCENT) limit 10
+PREHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT) limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, table sampling
-explain select * from src TABLESAMPLE (0.25 PERCENT) limit 10
+POSTHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT) limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) (TOK_TABLESPLITSAMPLE TOK_PERCENT 0.25))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 10)))
@@ -290,11 +282,9 @@ POSTHOOK: Input: default@src
 278	val_278
 98	val_98
 484	val_484
-PREHOOK: query: -- backward compatible (more)
-explain select * from src limit 10
+PREHOOK: query: explain select * from src limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- backward compatible (more)
-explain select * from src limit 10
+POSTHOOK: query: explain select * from src limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 10)))
@@ -390,11 +380,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 278	val_278	2008-04-08	11
 98	val_98	2008-04-08	11
 484	val_484	2008-04-08	11
-PREHOOK: query: -- select expression
-explain select cast(key as int) * 10, upper(value) from src limit 10
+PREHOOK: query: explain select cast(key as int) * 10, upper(value) from src limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- select expression
-explain select cast(key as int) * 10, upper(value) from src limit 10
+POSTHOOK: query: explain select cast(key as int) * 10, upper(value) from src limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (* (TOK_FUNCTION TOK_INT (TOK_TABLE_OR_COL key)) 10)) (TOK_SELEXPR (TOK_FUNCTION upper (TOK_TABLE_OR_COL value)))) (TOK_LIMIT 10)))
@@ -438,11 +426,9 @@ POSTHOOK: Input: default@src
 2780	VAL_278
 980	VAL_98
 4840	VAL_484
-PREHOOK: query: -- filter on non-partition column
-explain select key from src where key < 100 limit 10
+PREHOOK: query: explain select key from src where key < 100 limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- filter on non-partition column
-explain select key from src where key < 100 limit 10
+POSTHOOK: query: explain select key from src where key < 100 limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key))) (TOK_WHERE (< (TOK_TABLE_OR_COL key) 100)) (TOK_LIMIT 10)))
@@ -488,11 +474,9 @@ POSTHOOK: Input: default@src
 17
 0
 57
-PREHOOK: query: -- select expr for partitioned table
-explain select key from srcpart where ds='2008-04-08' AND hr='11' limit 10
+PREHOOK: query: explain select key from srcpart where ds='2008-04-08' AND hr='11' limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- select expr for partitioned table
-explain select key from srcpart where ds='2008-04-08' AND hr='11' limit 10
+POSTHOOK: query: explain select key from srcpart where ds='2008-04-08' AND hr='11' limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key))) (TOK_WHERE (AND (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= (TOK_TABLE_OR_COL hr) '11'))) (TOK_LIMIT 10)))
@@ -536,11 +520,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 278
 98
 484
-PREHOOK: query: -- virtual columns
-explain select *, BLOCK__OFFSET__INSIDE__FILE from src where key < 10 limit 10
+PREHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from src where key < 10 limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- virtual columns
-explain select *, BLOCK__OFFSET__INSIDE__FILE from src where key < 10 limit 10
+POSTHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from src where key < 10 limit 10
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF) (TOK_SELEXPR (TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE))) (TOK_WHERE (< (TOK_TABLE_OR_COL key) 10)) (TOK_LIMIT 10)))
@@ -590,11 +572,9 @@ POSTHOOK: Input: default@src
 17	val_17	910
 0	val_0	968
 57	val_57	1024
-PREHOOK: query: -- virtual columns on partitioned table
-explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart where key < 10 limit 30
+PREHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart where key < 10 limit 30
 PREHOOK: type: QUERY
-POSTHOOK: query: -- virtual columns on partitioned table
-explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart where key < 10 limit 30
+POSTHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart where key < 10 limit 30
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF) (TOK_SELEXPR (TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE))) (TOK_WHERE (< (TOK_TABLE_OR_COL key) 10)) (TOK_LIMIT 30)))
@@ -676,11 +656,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 2	val_2	2008-04-09	11	4004
 5	val_5	2008-04-09	11	4540
 9	val_9	2008-04-09	11	5398
-PREHOOK: query: -- bucket sampling
-explain select *, BLOCK__OFFSET__INSIDE__FILE from src TABLESAMPLE (BUCKET 1 OUT OF 40 ON key)
+PREHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from src TABLESAMPLE (BUCKET 1 OUT OF 40 ON key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- bucket sampling
-explain select *, BLOCK__OFFSET__INSIDE__FILE from src TABLESAMPLE (BUCKET 1 OUT OF 40 ON key)
+POSTHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from src TABLESAMPLE (BUCKET 1 OUT OF 40 ON key)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) (TOK_TABLEBUCKETSAMPLE 1 40 (TOK_TABLE_OR_COL key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF) (TOK_SELEXPR (TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE)))))
@@ -807,11 +785,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 77	val_77	2008-04-09	12	2622
 187	val_187	2008-04-09	12	4516
 448	val_448	2008-04-09	12	5636
-PREHOOK: query: -- split sampling
-explain select * from src TABLESAMPLE (0.25 PERCENT)
+PREHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- split sampling
-explain select * from src TABLESAMPLE (0.25 PERCENT)
+POSTHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT)
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src) (TOK_TABLESPLITSAMPLE TOK_PERCENT 0.25))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
@@ -903,11 +879,9 @@ POSTHOOK: Input: default@srcpart@ds=2008
 86	val_86	2008-04-09	11	12
 238	val_238	2008-04-09	12	0
 86	val_86	2008-04-09	12	12
-PREHOOK: query: -- non deterministic func
-explain select key, value, BLOCK__OFFSET__INSIDE__FILE from srcpart where ds="2008-04-09" AND rand() > 1
+PREHOOK: query: explain select key, value, BLOCK__OFFSET__INSIDE__FILE from srcpart where ds="2008-04-09" AND rand() > 1
 PREHOOK: type: QUERY
-POSTHOOK: query: -- non deterministic func
-explain select key, value, BLOCK__OFFSET__INSIDE__FILE from srcpart where ds="2008-04-09" AND rand() > 1
+POSTHOOK: query: explain select key, value, BLOCK__OFFSET__INSIDE__FILE from srcpart where ds="2008-04-09" AND rand() > 1
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value)) (TOK_SELEXPR (TOK_TABLE_OR_COL BLOCK__OFFSET__INSIDE__FILE))) (TOK_WHERE (AND (= (TOK_TABLE_OR_COL ds) "2008-04-09") (> (TOK_FUNCTION rand) 1)))))
@@ -950,11 +924,9 @@ POSTHOOK: Input: default@srcpart
 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 ####
-PREHOOK: query: -- negative, groupby
-explain select key, count(value) from src group by key
+PREHOOK: query: explain select key, count(value) from src group by key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, groupby
-explain select key, count(value) from src group by key
+POSTHOOK: query: explain select key, count(value) from src group by key
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_FUNCTION count (TOK_TABLE_OR_COL value)))) (TOK_GROUPBY (TOK_TABLE_OR_COL key))))
@@ -1027,11 +999,9 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- negative, distinct
-explain select distinct key, value from src
+PREHOOK: query: explain select distinct key, value from src
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, distinct
-explain select distinct key, value from src
+POSTHOOK: query: explain select distinct key, value from src
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECTDI (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value)))))
@@ -1105,11 +1075,9 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- negative, CTAS
-explain create table srcx as select distinct key, value from src
+PREHOOK: query: explain create table srcx as select distinct key, value from src
 PREHOOK: type: CREATETABLE_AS_SELECT
-POSTHOOK: query: -- negative, CTAS
-explain create table srcx as select distinct key, value from src
+POSTHOOK: query: explain create table srcx as select distinct key, value from src
 POSTHOOK: type: CREATETABLE_AS_SELECT
 ABSTRACT SYNTAX TREE:
   (TOK_CREATETABLE (TOK_TABNAME srcx) TOK_LIKETABLE (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECTDI (TOK_SELEXPR (TOK_TABLE_OR_COL key)) (TOK_SELEXPR (TOK_TABLE_OR_COL value))))))
@@ -1202,11 +1170,9 @@ STAGE PLANS:
     Stats-Aggr Operator
 
 
-PREHOOK: query: -- negative, analyze
-explain analyze table src compute statistics
+PREHOOK: query: explain analyze table src compute statistics
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, analyze
-explain analyze table src compute statistics
+POSTHOOK: query: explain analyze table src compute statistics
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_ANALYZE (TOK_TAB (TOK_TABNAME src)))
@@ -1227,11 +1193,9 @@ STAGE PLANS:
     Stats-Aggr Operator
 
 
-PREHOOK: query: -- negative, subq
-explain select a.* from (select * from src) a
+PREHOOK: query: explain select a.* from (select * from src) a
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, subq
-explain select a.* from (select * from src) a
+POSTHOOK: query: explain select a.* from (select * from src) a
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME a))))))
@@ -1266,11 +1230,9 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- negative, join
-explain select * from src join src src2 on src.key=src2.key
+PREHOOK: query: explain select * from src join src src2 on src.key=src2.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- negative, join
-explain select * from src join src src2 on src.key=src2.key
+POSTHOOK: query: explain select * from src join src src2 on src.key=src2.key
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF (TOK_TABNAME src)) (TOK_TABREF (TOK_TABNAME src) src2) (= (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src2) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))

Modified: hive/trunk/ql/src/test/results/clientpositive/orc_empty_strings.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_empty_strings.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_empty_strings.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_empty_strings.q.out Tue Apr  9 06:33:16 2013
@@ -18,15 +18,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_orc
 POSTHOOK: Lineage: test_orc.key SIMPLE []
-PREHOOK: query: -- Test reading a column which is just empty strings
-
-SELECT * FROM test_orc
+PREHOOK: query: SELECT * FROM test_orc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_orc
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test reading a column which is just empty strings
-
-SELECT * FROM test_orc
+POSTHOOK: query: SELECT * FROM test_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_orc
 #### A masked pattern was here ####
@@ -51,15 +47,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_orc
 POSTHOOK: Lineage: test_orc.key SIMPLE []
 POSTHOOK: Lineage: test_orc.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: -- Test reading a column which has some empty strings
-
-SELECT * FROM test_orc
+PREHOOK: query: SELECT * FROM test_orc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_orc
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test reading a column which has some empty strings
-
-SELECT * FROM test_orc
+POSTHOOK: query: SELECT * FROM test_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_orc
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed
-
-create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
+PREHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed
-
-create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
+POSTHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@mytbl
 PREHOOK: query: alter table mytbl add partition (c2 = 'v1')

Modified: hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed
-
-create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
+PREHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- The property needs to be unset at the end of the test till HIVE-3109/HIVE-3112 is fixed
-
-create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
+POSTHOOK: query: create table mytbl (c1 tinyint) partitioned by (c2 string) tblproperties ('a'='myval','b'='yourval','c'='noval')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@mytbl
 PREHOOK: query: alter table mytbl add partition (c2 = 'v1')

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table prt(key string, value string) partitioned by (dt string)
+PREHOOK: query: create table prt(key string, value string) partitioned by (dt string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table prt(key string, value string) partitioned by (dt string)
+POSTHOOK: query: create table prt(key string, value string) partitioned by (dt string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@prt
 PREHOOK: query: insert overwrite table prt partition(dt='1') select * from src where key = 238

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned
 PREHOOK: query: alter table partition_test_partitioned set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe'

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned
 PREHOOK: query: alter table partition_test_partitioned set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe'

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- This tests that the schema can be changed for partitioned tables for binary serde data for joins
-create table T1(key string, value string) partitioned by (dt string) stored as rcfile
+PREHOOK: query: create table T1(key string, value string) partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for partitioned tables for binary serde data for joins
-create table T1(key string, value string) partitioned by (dt string) stored as rcfile
+POSTHOOK: query: create table T1(key string, value string) partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@T1
 PREHOOK: query: alter table T1 set serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe'

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out Tue Apr  9 06:33:16 2013
@@ -90,8 +90,7 @@ POSTHOOK: Lineage: tbl1 PARTITION(ds=2).
 POSTHOOK: Lineage: tbl1 PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- The subquery itself is being map-joined. Multiple partitions of tbl1 with different schemas are being read for tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+PREHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -103,8 +102,7 @@ PREHOOK: Input: default@tbl1@ds=2
 PREHOOK: Input: default@tbl2
 PREHOOK: Input: default@tbl2@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- The subquery itself is being map-joined. Multiple partitions of tbl1 with different schemas are being read for tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+POSTHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -123,10 +121,7 @@ POSTHOOK: Lineage: tbl1 PARTITION(ds=2).
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 40
-PREHOOK: query: -- The subquery itself is being map-joined. Since the sub-query only contains selects and filters, it should 
--- be converted to a bucketized mapside join. Multiple partitions of tbl1 with different schemas are being read for each
--- bucket of tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+PREHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -138,10 +133,7 @@ PREHOOK: Input: default@tbl1@ds=2
 PREHOOK: Input: default@tbl2
 PREHOOK: Input: default@tbl2@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- The subquery itself is being map-joined. Since the sub-query only contains selects and filters, it should 
--- be converted to a bucketized mapside join. Multiple partitions of tbl1 with different schemas are being read for each
--- bucket of tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+POSTHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -160,10 +152,7 @@ POSTHOOK: Lineage: tbl1 PARTITION(ds=2).
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 40
-PREHOOK: query: -- The subquery itself is being map-joined. Since the sub-query only contains selects and filters, it should 
--- be converted to a sort-merge join. Multiple partitions of tbl1 with different schemas are being read for a
--- given file of tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+PREHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -175,10 +164,7 @@ PREHOOK: Input: default@tbl1@ds=2
 PREHOOK: Input: default@tbl2
 PREHOOK: Input: default@tbl2@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- The subquery itself is being map-joined. Since the sub-query only contains selects and filters, it should 
--- be converted to a sort-merge join. Multiple partitions of tbl1 with different schemas are being read for a
--- given file of tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+POSTHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key as key, a.value as value from tbl1 a where key < 6) subq1 
     join
   (select a.key as key, a.value as value from tbl2 a where key < 6) subq2
@@ -197,9 +183,7 @@ POSTHOOK: Lineage: tbl1 PARTITION(ds=2).
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tbl2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 40
-PREHOOK: query: -- Since the join key is modified by the sub-query, neither sort-merge join not bucketized map-side
--- join should be performed.  Multiple partitions of tbl1 with different schemas are being read for tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+PREHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key+1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 
     join
   (select a.key+1 as key, concat(a.value, a.value) as value from tbl2 a) subq2
@@ -211,9 +195,7 @@ PREHOOK: Input: default@tbl1@ds=2
 PREHOOK: Input: default@tbl2
 PREHOOK: Input: default@tbl2@ds=1
 #### A masked pattern was here ####
-POSTHOOK: query: -- Since the join key is modified by the sub-query, neither sort-merge join not bucketized map-side
--- join should be performed.  Multiple partitions of tbl1 with different schemas are being read for tbl2
-select /*+mapjoin(subq1)*/ count(*) from 
+POSTHOOK: query: select /*+mapjoin(subq1)*/ count(*) from 
   (select a.key+1 as key, concat(a.value, a.value) as value from tbl1 a) subq1 
     join
   (select a.key+1 as key, concat(a.value, a.value) as value from tbl2 a) subq2

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out Tue Apr  9 06:33:16 2013
@@ -1,9 +1,7 @@
-PREHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string)
+PREHOOK: query: create table partition_test_partitioned(key string, value string)
 partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string)
+POSTHOOK: query: create table partition_test_partitioned(key string, value string)
 partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out Tue Apr  9 06:33:16 2013
@@ -1,9 +1,7 @@
-PREHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string)
+PREHOOK: query: create table partition_test_partitioned(key string, value string)
 partitioned by (dt string) stored as textfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that the schema can be changed for binary serde data
-create table partition_test_partitioned(key string, value string)
+POSTHOOK: query: create table partition_test_partitioned(key string, value string)
 partitioned by (dt string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but
--- also different serdes
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but
--- also different serdes
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned
 PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src

Modified: hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but
--- also different serdes
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+PREHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that a query can span multiple partitions which can not only have different file formats, but
--- also different serdes
-create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
+POSTHOOK: query: create table partition_test_partitioned(key string, value string) partitioned by (dt string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@partition_test_partitioned
 PREHOOK: query: insert overwrite table partition_test_partitioned partition(dt='1') select * from src

Modified: hive/trunk/ql/src/test/results/clientpositive/plan_json.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/plan_json.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/plan_json.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/plan_json.q.out Tue Apr  9 06:33:16 2013
@@ -1,9 +1,5 @@
-PREHOOK: query: -- explain plan json:  the query gets the formatted json output of the query plan of the hive query
-
-EXPLAIN FORMATTED SELECT count(1) FROM src
+PREHOOK: query: EXPLAIN FORMATTED SELECT count(1) FROM src
 PREHOOK: type: QUERY
-POSTHOOK: query: -- explain plan json:  the query gets the formatted json output of the query plan of the hive query
-
-EXPLAIN FORMATTED SELECT count(1) FROM src
+POSTHOOK: query: EXPLAIN FORMATTED SELECT count(1) FROM src
 POSTHOOK: type: QUERY
 {"STAGE PLANS":{"Stage-1":{"Map Reduce":{"Reduce Operator Tree:":{"GBY_4":{"SEL_5":{"FS_6":{"File Output Operator":{"GlobalTableId:":"0","compressed:":"false","table:":{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"}}}}}},"Split Sample:":{},"Alias -> Map Operator Tree:":{"src":{"TS_0":{"SEL_1":{"GBY_2":{"RS_3":{"Reduce Output Operator":{"Map-reduce partition columns:":[],"sort order:":"","tag:":"-1","value expressions:":[{"type:":"bigint","expr:":"_col0"}],"key expressions:":[]}}}}}}}}},"Stage-0":{"Fetch Operator":{"limit:":"-1"}}},"STAGE DEPENDENCIES":{"Stage-1":{"ROOT STAGE":"TRUE"},"Stage-0":{"ROOT STAGE":"TRUE"}},"ABSTRACT SYNTAX TREE":"(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)))))"}

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_constant_where.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_constant_where.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_constant_where.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_constant_where.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- Test that the partition pruner does not fail when there is a constant expression in the filter
-
-EXPLAIN SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 'a'
+PREHOOK: query: EXPLAIN SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 'a'
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test that the partition pruner does not fail when there is a constant expression in the filter
-
-EXPLAIN SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 'a'
+POSTHOOK: query: EXPLAIN SELECT COUNT(*) FROM srcpart WHERE ds = '2008-04-08' and 'a' = 'a'
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTIONSTAR COUNT))) (TOK_WHERE (and (= (TOK_TABLE_OR_COL ds) '2008-04-08') (= 'a' 'a')))))

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out Tue Apr  9 06:33:16 2013
@@ -16,15 +16,13 @@ PREHOOK: type: CREATETABLE
 POSTHOOK: query: create table pokes2 (foo int, bar int, blah int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@pokes2
-PREHOOK: query: -- Q1: predicate should not be pushed on the right side of a left outer join
-explain
+PREHOOK: query: explain
 SELECT a.foo as foo1, b.foo as foo2, b.bar
 FROM pokes a LEFT OUTER JOIN pokes2 b
 ON a.foo=b.foo
 WHERE b.bar=3
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Q1: predicate should not be pushed on the right side of a left outer join
-explain
+POSTHOOK: query: explain
 SELECT a.foo as foo1, b.foo as foo2, b.bar
 FROM pokes a LEFT OUTER JOIN pokes2 b
 ON a.foo=b.foo
@@ -107,16 +105,14 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- Q2: predicate should not be pushed on the right side of a left outer join
-explain
+PREHOOK: query: explain
 SELECT * FROM
     (SELECT a.foo as foo1, b.foo as foo2, b.bar
     FROM pokes a LEFT OUTER JOIN pokes2 b
     ON a.foo=b.foo) a
 WHERE a.bar=3
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Q2: predicate should not be pushed on the right side of a left outer join
-explain
+POSTHOOK: query: explain
 SELECT * FROM
     (SELECT a.foo as foo1, b.foo as foo2, b.bar
     FROM pokes a LEFT OUTER JOIN pokes2 b
@@ -200,16 +196,14 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- Q3: predicate should be pushed
-explain
+PREHOOK: query: explain
 SELECT * FROM
     (SELECT a.foo as foo1, b.foo as foo2, a.bar
     FROM pokes a JOIN pokes2 b
     ON a.foo=b.foo) a
 WHERE a.bar=3
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Q3: predicate should be pushed
-explain
+POSTHOOK: query: explain
 SELECT * FROM
     (SELECT a.foo as foo1, b.foo as foo2, a.bar
     FROM pokes a JOIN pokes2 b
@@ -293,11 +287,9 @@ STAGE PLANS:
       limit: -1
 
 
-PREHOOK: query: -- Q4: here, the filter c.bar should be created under the first join but above the second
-explain select c.foo, d.bar from (select c.foo, b.bar, c.blah from pokes c left outer join pokes b on c.foo=b.foo) c left outer join pokes d where d.foo=1 and c.bar=2
+PREHOOK: query: explain select c.foo, d.bar from (select c.foo, b.bar, c.blah from pokes c left outer join pokes b on c.foo=b.foo) c left outer join pokes d where d.foo=1 and c.bar=2
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Q4: here, the filter c.bar should be created under the first join but above the second
-explain select c.foo, d.bar from (select c.foo, b.bar, c.blah from pokes c left outer join pokes b on c.foo=b.foo) c left outer join pokes d where d.foo=1 and c.bar=2
+POSTHOOK: query: explain select c.foo, d.bar from (select c.foo, b.bar, c.blah from pokes c left outer join pokes b on c.foo=b.foo) c left outer join pokes d where d.foo=1 and c.bar=2
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_LEFTOUTERJOIN (TOK_TABREF (TOK_TABNAME pokes) c) (TOK_TABREF (TOK_TABNAME pokes) b) (= (. (TOK_TABLE_OR_COL c) foo) (. (TOK_TABLE_OR_COL b) foo)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) foo)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL b) bar)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) blah))))) c) (TOK_TABREF (TOK_TABNAME pokes) d))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL c) foo)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL d) bar))) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL d) foo) 1) (= (. (TOK_TABLE_OR_COL c) bar) 2)))))

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- test predicate pushdown on a view with a union
-
-drop view v
+PREHOOK: query: drop view v
 PREHOOK: type: DROPVIEW
-POSTHOOK: query: -- test predicate pushdown on a view with a union
-
-drop view v
+POSTHOOK: query: drop view v
 POSTHOOK: type: DROPVIEW
 PREHOOK: query: create table t1_new (key string, value string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/protectmode.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/protectmode.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/protectmode.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/protectmode.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl1
+PREHOOK: query: drop table tbl1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: -- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl1
+POSTHOOK: query: drop table tbl1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: drop table tbl2
 PREHOOK: type: DROPTABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/ptf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf.q.out Tue Apr  9 06:33:16 2013
@@ -2,8 +2,7 @@ PREHOOK: query: DROP TABLE part
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE part
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: -- data setup
-CREATE TABLE part( 
+PREHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -15,8 +14,7 @@ CREATE TABLE part( 
     p_comment STRING
 )
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- data setup
-CREATE TABLE part( 
+POSTHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -85,8 +83,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	5190.08
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	6208.18
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	7672.66
-PREHOOK: query: -- 2. testJoinWithNoop
-select p_mfgr, p_name,
+PREHOOK: query: select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz
 from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
 distribute by j.p_mfgr
@@ -94,8 +91,7 @@ sort by j.p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. testJoinWithNoop
-select p_mfgr, p_name,
+POSTHOOK: query: select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz
 from noop (on (select p1.* from part p1 join part p2 on p1.p_partkey = p2.p_partkey) j
 distribute by j.p_mfgr
@@ -131,16 +127,14 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	-4
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	44
 Manufacturer#5	almond azure blanched chiffon midnight	23	-23
-PREHOOK: query: -- 3. testOnlyPTF
-select p_mfgr, p_name, p_size
+PREHOOK: query: select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3. testOnlyPTF
-select p_mfgr, p_name, p_size
+POSTHOOK: query: select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
 order by p_name)
@@ -173,8 +167,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
-PREHOOK: query: -- 4. testPTFAlias
-select p_mfgr, p_name, p_size,
+PREHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -185,8 +178,7 @@ from noop(on part 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 4. testPTFAlias
-select p_mfgr, p_name, p_size,
+POSTHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -223,8 +215,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	5190.08
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	6208.18
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	7672.66
-PREHOOK: query: -- 5. testPTFAndWhereWithWindowing
-select p_mfgr, p_name, p_size, 
+PREHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz 
@@ -235,8 +226,7 @@ from noop(on part 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 5. testPTFAndWhereWithWindowing
-select p_mfgr, p_name, p_size, 
+POSTHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz 
@@ -273,8 +263,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	2	-4
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	46	44
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	23	-23
-PREHOOK: query: -- 6. testSWQAndPTFAndGBy
-select p_mfgr, p_name, p_size, 
+PREHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz 
@@ -286,8 +275,7 @@ group by p_mfgr, p_name, p_size
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 6. testSWQAndPTFAndGBy
-select p_mfgr, p_name, p_size, 
+POSTHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by p_name) as deltaSz 
@@ -324,8 +312,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	2	-4
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	46	44
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	23	-23
-PREHOOK: query: -- 7. testJoin
-select abc.* 
+PREHOOK: query: select abc.* 
 from noop(on part 
 partition by p_mfgr 
 order by p_name 
@@ -333,8 +320,7 @@ order by p_name 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 7. testJoin
-select abc.* 
+POSTHOOK: query: select abc.* 
 from noop(on part 
 partition by p_mfgr 
 order by p_name 
@@ -370,8 +356,7 @@ POSTHOOK: Input: default@part
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
-PREHOOK: query: -- 8. testJoinRight
-select abc.* 
+PREHOOK: query: select abc.* 
 from part p1 join noop(on part 
 partition by p_mfgr 
 order by p_name 
@@ -379,8 +364,7 @@ order by p_name 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 8. testJoinRight
-select abc.* 
+POSTHOOK: query: select abc.* 
 from part p1 join noop(on part 
 partition by p_mfgr 
 order by p_name 
@@ -416,8 +400,7 @@ POSTHOOK: Input: default@part
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
-PREHOOK: query: -- 9. testNoopWithMap
-select p_mfgr, p_name, p_size, 
+PREHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part
 partition by p_mfgr
@@ -425,8 +408,7 @@ order by p_name, p_size desc)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 9. testNoopWithMap
-select p_mfgr, p_name, p_size, 
+POSTHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
 from noopwithmap(on part
 partition by p_mfgr
@@ -460,8 +442,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4
 Manufacturer#5	almond azure blanched chiffon midnight	23	5
-PREHOOK: query: -- 10. testNoopWithMapWithWindowing 
-select p_mfgr, p_name, p_size,
+PREHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -471,8 +452,7 @@ from noopwithmap(on part 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 10. testNoopWithMapWithWindowing 
-select p_mfgr, p_name, p_size,
+POSTHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -508,8 +488,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	5190.08
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	6208.18
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	7672.66
-PREHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
-select p_mfgr, p_name, p_size,
+PREHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -519,8 +498,7 @@ order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 11. testHavingWithWindowingPTFNoGBY
-select p_mfgr, p_name, p_size,
+POSTHOOK: query: select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
 dense_rank() over (partition by p_mfgr order by p_name) as dr,
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -556,8 +534,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	5190.08
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	6208.18
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	7672.66
-PREHOOK: query: -- 12. testFunctionChain
-select p_mfgr, p_name, p_size, 
+PREHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)  as s1
@@ -568,8 +545,7 @@ order by p_mfgr, p_name
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 12. testFunctionChain
-select p_mfgr, p_name, p_size, 
+POSTHOOK: query: select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)  as s1
@@ -606,8 +582,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2	3	3	5190.08
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	4	4	6208.18
 Manufacturer#5	almond azure blanched chiffon midnight	23	5	5	7672.66
-PREHOOK: query: -- 13. testPTFAndWindowingInSubQ
-select p_mfgr, p_name, 
+PREHOOK: query: select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
 count(p_size) over (partition by p_mfgr order by p_name) as cd, 
@@ -621,8 +596,7 @@ window w1 as (partition by p_mfgr order 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 13. testPTFAndWindowingInSubQ
-select p_mfgr, p_name, 
+POSTHOOK: query: select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
 from (select p_mfgr, p_name, 
 count(p_size) over (partition by p_mfgr order by p_name) as cd, 
@@ -662,8 +636,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	3	7672.66
 Manufacturer#5	almond aquamarine dodger light gainsboro	4	5882.970000000001
 Manufacturer#5	almond azure blanched chiffon midnight	5	4271.3099999999995
-PREHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-select abc.p_mfgr, abc.p_name, 
+PREHOOK: query: select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
 count(abc.p_name) over (distribute by abc.p_mfgr sort by abc.p_name) as cd, 
@@ -676,8 +649,7 @@ order by p_name 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 14. testPTFJoinWithWindowingWithCount
-select abc.p_mfgr, abc.p_name, 
+POSTHOOK: query: select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
 dense_rank() over (distribute by abc.p_mfgr sort by abc.p_name) as dr, 
 count(abc.p_name) over (distribute by abc.p_mfgr sort by abc.p_name) as cd, 
@@ -718,16 +690,14 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	3	3	3	1788.73	5190.08	2	-4
 Manufacturer#5	almond aquamarine dodger light gainsboro	4	4	4	1018.1	6208.18	46	44
 Manufacturer#5	almond azure blanched chiffon midnight	5	5	5	1464.48	7672.66	23	-23
-PREHOOK: query: -- 15. testDistinctInSelectWithPTF
-select DISTINCT p_mfgr, p_name, p_size 
+PREHOOK: query: select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
 order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 15. testDistinctInSelectWithPTF
-select DISTINCT p_mfgr, p_name, p_size 
+POSTHOOK: query: select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
 order by p_name)
@@ -759,15 +729,13 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	2
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
-PREHOOK: query: -- 16. testViewAsTableInputToPTF
-create view IF NOT EXISTS mfgr_price_view as 
+PREHOOK: query: create view IF NOT EXISTS mfgr_price_view as 
 select p_mfgr, p_brand, 
 sum(p_retailprice) as s 
 from part 
 group by p_mfgr, p_brand
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- 16. testViewAsTableInputToPTF
-create view IF NOT EXISTS mfgr_price_view as 
+POSTHOOK: query: create view IF NOT EXISTS mfgr_price_view as 
 select p_mfgr, p_brand, 
 sum(p_retailprice) as s 
 from part 
@@ -810,8 +778,7 @@ Manufacturer#4	Brand#42	2581.68000000000
 Manufacturer#5	Brand#51	1611.66	1611.66
 Manufacturer#5	Brand#52	3254.17	4865.83
 Manufacturer#5	Brand#53	2806.83	7672.66
-PREHOOK: query: -- 17. testMultipleInserts2SWQsWithPTF
-CREATE TABLE part_4( 
+PREHOOK: query: CREATE TABLE part_4( 
 p_mfgr STRING, 
 p_name STRING, 
 p_size INT, 
@@ -819,8 +786,7 @@ r INT, 
 dr INT, 
 s DOUBLE)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- 17. testMultipleInserts2SWQsWithPTF
-CREATE TABLE part_4( 
+POSTHOOK: query: CREATE TABLE part_4( 
 p_mfgr STRING, 
 p_name STRING, 
 p_size INT, 
@@ -1003,8 +969,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond azure blanched chiffon midnight	23	108	23	5	5	1.0	2
 Manufacturer#5	almond antique blue firebrick mint	31	31	31	1	1	0.2	31
 Manufacturer#5	almond aquamarine dodger light gainsboro	46	85	46	4	4	0.8	6
-PREHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr,p_name rows between unbounded preceding and current row)  as s1
@@ -1022,8 +987,7 @@ from noop(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 18. testMulti2OperatorsFunctionChainWithMap
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr,p_name rows between unbounded preceding and current row)  as s1
@@ -1082,8 +1046,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	1	1	2	2
 Manufacturer#5	almond aquamarine dodger light gainsboro	1	1	46	46
 Manufacturer#5	almond azure blanched chiffon midnight	1	1	23	23
-PREHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)  as s1
@@ -1101,8 +1064,7 @@ from noop(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 19. testMulti3OperatorsFunctionChain
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row)  as s1
@@ -1161,8 +1123,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	3	3	2	39
 Manufacturer#5	almond aquamarine dodger light gainsboro	4	4	46	85
 Manufacturer#5	almond azure blanched chiffon midnight	5	5	23	108
-PREHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr order by p_name) as s1 
@@ -1178,8 +1139,7 @@ from noop(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 20. testMultiOperatorChainWithNoWindowing
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr order by p_name) as s1 
@@ -1236,8 +1196,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	3	3	2	39
 Manufacturer#5	almond aquamarine dodger light gainsboro	4	4	46	85
 Manufacturer#5	almond azure blanched chiffon midnight	5	5	23	108
-PREHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr,p_name rows between unbounded preceding and current row)  as s1 
@@ -1255,8 +1214,7 @@ from noopwithmap(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 21. testMultiOperatorChainEndsWithNoopMap
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name) as dr, 
 p_size, sum(p_size) over (partition by p_mfgr,p_name rows between unbounded preceding and current row)  as s1 
@@ -1315,8 +1273,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	1	1	2	2
 Manufacturer#5	almond aquamarine dodger light gainsboro	1	1	46	46
 Manufacturer#5	almond azure blanched chiffon midnight	1	1	23	23
-PREHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
 p_size, 
@@ -1333,8 +1290,7 @@ from noop(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 22. testMultiOperatorChainWithDiffPartitionForWindow1
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
 dense_rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as dr, 
 p_size, 
@@ -1392,8 +1348,7 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	1	1	2	2	2
 Manufacturer#5	almond aquamarine dodger light gainsboro	1	1	46	46	46
 Manufacturer#5	almond azure blanched chiffon midnight	1	1	23	23	23
-PREHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-select p_mfgr, p_name,  
+PREHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_mfgr) as r, 
 dense_rank() over (partition by p_mfgr order by p_mfgr) as dr, 
 p_size, 
@@ -1408,8 +1363,7 @@ from noopwithmap(on 
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 23. testMultiOperatorChainWithDiffPartitionForWindow2
-select p_mfgr, p_name,  
+POSTHOOK: query: select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_mfgr) as r, 
 dense_rank() over (partition by p_mfgr order by p_mfgr) as dr, 
 p_size, 

Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_decimal.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_decimal.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_decimal.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_decimal.q.out Tue Apr  9 06:33:16 2013
@@ -2,8 +2,7 @@ PREHOOK: query: DROP TABLE IF EXISTS par
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS part
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: -- data setup
-CREATE TABLE part( 
+PREHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -15,8 +14,7 @@ CREATE TABLE part( 
     p_comment STRING
 )
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- data setup
-CREATE TABLE part( 
+POSTHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -35,9 +33,7 @@ PREHOOK: Output: default@part
 POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
-PREHOOK: query: -- 1. aggregate functions with decimal type
-
-select p_mfgr, p_retailprice,
+PREHOOK: query: select p_mfgr, p_retailprice,
 lead(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c1,
 lag(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c2,
 first_value(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c3,
@@ -46,9 +42,7 @@ from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. aggregate functions with decimal type
-
-select p_mfgr, p_retailprice,
+POSTHOOK: query: select p_mfgr, p_retailprice,
 lead(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c1,
 lag(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c2,
 first_value(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c3,
@@ -83,9 +77,7 @@ Manufacturer#5	1611.66	1788.73	1789.69	1
 Manufacturer#5	1788.73	1018.1	1611.66	1789.69	1788.73
 Manufacturer#5	1018.1	1464.48	1788.73	1789.69	1018.1
 Manufacturer#5	1464.48	NULL	1018.1	1789.69	1464.48
-PREHOOK: query: -- 2. ranking functions with decimal type
-
-select p_mfgr, p_retailprice,
+PREHOOK: query: select p_mfgr, p_retailprice,
 row_number() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c1,
 rank() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c2,
 dense_rank() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c3,
@@ -96,9 +88,7 @@ from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. ranking functions with decimal type
-
-select p_mfgr, p_retailprice,
+POSTHOOK: query: select p_mfgr, p_retailprice,
 row_number() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c1,
 rank() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c2,
 dense_rank() over (PARTITION BY p_mfgr ORDER BY p_retailprice) as c3,
@@ -135,17 +125,13 @@ Manufacturer#5	1464.48	2	2	2	0.25	0.4	2
 Manufacturer#5	1611.66	3	3	3	0.5	0.6	3
 Manufacturer#5	1788.73	4	4	4	0.75	0.8	4
 Manufacturer#5	1789.69	5	5	5	1.0	1.0	5
-PREHOOK: query: -- 3. order by decimal
-
-select p_mfgr, p_retailprice,
+PREHOOK: query: select p_mfgr, p_retailprice,
 lag(p_retailprice) over (partition by p_mfgr ORDER BY p_retailprice desc) as c1
 from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3. order by decimal
-
-select p_mfgr, p_retailprice,
+POSTHOOK: query: select p_mfgr, p_retailprice,
 lag(p_retailprice) over (partition by p_mfgr ORDER BY p_retailprice desc) as c1
 from part
 POSTHOOK: type: QUERY
@@ -177,17 +163,13 @@ Manufacturer#5	1788.73	1789.69
 Manufacturer#5	1611.66	1788.73
 Manufacturer#5	1464.48	1611.66
 Manufacturer#5	1018.1	1464.48
-PREHOOK: query: -- 4. partition by decimal
-
-select p_mfgr, p_retailprice,
+PREHOOK: query: select p_mfgr, p_retailprice,
 lag(p_retailprice) over (partition by p_retailprice) as c1
 from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 4. partition by decimal
-
-select p_mfgr, p_retailprice,
+POSTHOOK: query: select p_mfgr, p_retailprice,
 lag(p_retailprice) over (partition by p_retailprice) as c1
 from part
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_general_queries.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_general_queries.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_general_queries.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_general_queries.q.out Tue Apr  9 06:33:16 2013
@@ -2,8 +2,7 @@ PREHOOK: query: DROP TABLE part
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE part
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: -- data setup
-CREATE TABLE part( 
+PREHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -15,8 +14,7 @@ CREATE TABLE part( 
     p_comment STRING
 )
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- data setup
-CREATE TABLE part( 
+POSTHOOK: query: CREATE TABLE part( 
     p_partkey INT,
     p_name STRING,
     p_mfgr STRING,
@@ -35,16 +33,14 @@ PREHOOK: Output: default@part
 POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
-PREHOOK: query: -- 1. testNoPTFNoWindowing
-select p_mfgr, p_name, p_size
+PREHOOK: query: select p_mfgr, p_name, p_size
 from part
 distribute by p_mfgr
 sort by p_name
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. testNoPTFNoWindowing
-select p_mfgr, p_name, p_size
+POSTHOOK: query: select p_mfgr, p_name, p_size
 from part
 distribute by p_mfgr
 sort by p_name
@@ -77,8 +73,7 @@ Manufacturer#2	almond aquamarine sandy c
 Manufacturer#4	almond aquamarine yellow dodger mint	7
 Manufacturer#4	almond azure aquamarine papaya violet	12
 Manufacturer#5	almond azure blanched chiffon midnight	23
-PREHOOK: query: -- 2. testUDAFsNoWindowingNoPTFNoGBY
-select p_mfgr,p_name, p_retailprice,  
+PREHOOK: query: select p_mfgr,p_name, p_retailprice,  
 sum(p_retailprice) over(partition by p_mfgr order by p_mfgr) as s,
 min(p_retailprice) over(partition by p_mfgr order by p_mfgr) as mi,
 max(p_retailprice) over(partition by p_mfgr order by p_mfgr) as ma,
@@ -87,8 +82,7 @@ from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 2. testUDAFsNoWindowingNoPTFNoGBY
-select p_mfgr,p_name, p_retailprice,  
+POSTHOOK: query: select p_mfgr,p_name, p_retailprice,  
 sum(p_retailprice) over(partition by p_mfgr order by p_mfgr) as s,
 min(p_retailprice) over(partition by p_mfgr order by p_mfgr) as mi,
 max(p_retailprice) over(partition by p_mfgr order by p_mfgr) as ma,
@@ -123,13 +117,11 @@ Manufacturer#5	almond antique medium spr
 Manufacturer#5	almond antique sky peru orange	1788.73	7672.66	1018.1	1789.69	1534.532
 Manufacturer#5	almond aquamarine dodger light gainsboro	1018.1	7672.66	1018.1	1789.69	1534.532
 Manufacturer#5	almond azure blanched chiffon midnight	1464.48	7672.66	1018.1	1789.69	1534.532
-PREHOOK: query: -- 3. testConstExprInSelect
-select 'tst1' as key, count(1) as value from part
+PREHOOK: query: select 'tst1' as key, count(1) as value from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 3. testConstExprInSelect
-select 'tst1' as key, count(1) as value from part
+POSTHOOK: query: select 'tst1' as key, count(1) as value from part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####



Mime
View raw message