You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/04/10 02:07:09 UTC

svn commit: r1466300 [11/13] - in /hive/trunk: cli/src/java/org/apache/hadoop/hive/cli/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/

Modified: hive/trunk/ql/src/test/results/clientpositive/stats19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats19.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats19.q.out Wed Apr 10 00:06:55 2013
@@ -1,27 +1,41 @@
-PREHOOK: query: create table stats_part like srcpart
+PREHOOK: query: -- Note, its important that the partitions created below have a name greater than 16 characters in
+-- length since KeyVerifyingStatsAggregator depends on checking that a keyPrefix is hashed by the
+-- length of the keyPrefix, having a partition name greather than 16 characters guarantees no false
+-- positives.
+
+create table stats_part like srcpart
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table stats_part like srcpart
+POSTHOOK: query: -- Note, its important that the partitions created below have a name greater than 16 characters in
+-- length since KeyVerifyingStatsAggregator depends on checking that a keyPrefix is hashed by the
+-- length of the keyPrefix, having a partition name greather than 16 characters guarantees no false
+-- positives.
+
+create table stats_part like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@stats_part
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
 Stats prefix is hashed: true
 Stats prefix is hashed: true
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
 Stats prefix is hashed: false
 Stats prefix is hashed: false
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -29,13 +43,15 @@ POSTHOOK: Lineage: stats_part PARTITION(
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
 Stats prefix is hashed: false
 Stats prefix is hashed: false
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -45,11 +61,19 @@ POSTHOOK: Lineage: stats_part PARTITION(
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- Run the tests again and verify the stats are correct, this should verify that the stats publisher
+-- is hashing as well where appropriate
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- Run the tests again and verify the stats are correct, this should verify that the stats publisher
+-- is hashing as well where appropriate
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -108,11 +132,13 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -175,11 +201,13 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+PREHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
+POSTHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr = '13') select key, value from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -246,13 +274,19 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- Do the same for dynamic partitions
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
 Stats prefix is hashed: true
 Stats prefix is hashed: true
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- Do the same for dynamic partitions
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -270,13 +304,15 @@ POSTHOOK: Lineage: stats_part PARTITION(
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
 Stats prefix is hashed: false
 Stats prefix is hashed: false
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -296,13 +332,15 @@ POSTHOOK: Lineage: stats_part PARTITION(
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
 Stats prefix is hashed: false
 Stats prefix is hashed: false
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -324,11 +362,19 @@ POSTHOOK: Lineage: stats_part PARTITION(
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_part PARTITION(ds=2010-04-08,hr=13).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- Run the tests again and verify the stats are correct, this should verify that the stats publisher
+-- is hashing as well where appropriate
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- Run the tests again and verify the stats are correct, this should verify that the stats publisher
+-- is hashing as well where appropriate
+
+-- The stats key should be hashed since the max length is too small
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -411,11 +457,13 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- The stats key should not be hashed since the max length is large enough
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13
@@ -502,11 +550,13 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+PREHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@stats_part@ds=2010-04-08
-POSTHOOK: query: insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
+POSTHOOK: query: -- The stats key should not be hashed since negative values should imply hashing is turned off
+insert overwrite table stats_part partition (ds='2010-04-08', hr) select key, value, '13' from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_part@ds=2010-04-08/hr=13

Modified: hive/trunk/ql/src/test/results/clientpositive/stats20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats20.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats20.q.out Wed Apr 10 00:06:55 2013
@@ -15,9 +15,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@stats_partitioned@ds=1
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted stats_partitioned
+PREHOOK: query: -- rawDataSize is 5312 after config is turned on
+describe formatted stats_partitioned
 PREHOOK: type: DESCTABLE
-POSTHOOK: query: describe formatted stats_partitioned
+POSTHOOK: query: -- rawDataSize is 5312 after config is turned on
+describe formatted stats_partitioned
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
@@ -70,9 +72,11 @@ POSTHOOK: Lineage: stats_partitioned PAR
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted stats_partitioned
+PREHOOK: query: -- rawDataSize is 0 after config is turned off
+describe formatted stats_partitioned
 PREHOOK: type: DESCTABLE
-POSTHOOK: query: describe formatted stats_partitioned
+POSTHOOK: query: -- rawDataSize is 0 after config is turned off
+describe formatted stats_partitioned
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,18 @@
-PREHOOK: query: create table tmptable(key string, value string)
+PREHOOK: query: -- In this test, there is a dummy stats aggregator which throws an error when various
+-- methods are called (as indicated by the parameter hive.test.dummystats.agregator)
+-- Since stats need not be reliable (by setting hive.stats.reliable to false), the 
+-- insert statements succeed. The insert statement succeeds even if the stats aggregator
+-- is set to null, since stats need not be reliable.
+
+create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table tmptable(key string, value string)
+POSTHOOK: query: -- In this test, there is a dummy stats aggregator which throws an error when various
+-- methods are called (as indicated by the parameter hive.test.dummystats.agregator)
+-- Since stats need not be reliable (by setting hive.stats.reliable to false), the 
+-- insert statements succeed. The insert statement succeeds even if the stats aggregator
+-- is set to null, since stats need not be reliable.
+
+create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_empty_dyn_part.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,14 @@
-PREHOOK: query: create table tmptable(key string) partitioned by (part string)
+PREHOOK: query: -- This test verifies writing a query using dynamic partitions
+-- which results in no partitions actually being created with
+-- hive.stats.reliable set to true
+
+create table tmptable(key string) partitioned by (part string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table tmptable(key string) partitioned by (part string)
+POSTHOOK: query: -- This test verifies writing a query using dynamic partitions
+-- which results in no partitions actually being created with
+-- hive.stats.reliable set to true
+
+create table tmptable(key string) partitioned by (part string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: explain insert overwrite table tmptable partition (part) select key, value from src where key = 'no_such_value'

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_empty_partition.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_empty_partition.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_empty_partition.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_empty_partition.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,12 @@
-PREHOOK: query: create table tmptable(key string, value string) partitioned by (part string)
+PREHOOK: query: -- This test verifies that writing an empty partition succeeds when
+-- hive.stats.reliable is set to true.
+
+create table tmptable(key string, value string) partitioned by (part string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table tmptable(key string, value string) partitioned by (part string)
+POSTHOOK: query: -- This test verifies that writing an empty partition succeeds when
+-- hive.stats.reliable is set to true.
+
+create table tmptable(key string, value string) partitioned by (part string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: insert overwrite table tmptable partition (part = '1') select * from src where key = 'no_such_value'

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_noscan_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_noscan_1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_noscan_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_noscan_1.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,12 @@
-PREHOOK: query: create table analyze_srcpart like srcpart
+PREHOOK: query: -- test analyze table ... compute statistics noscan
+
+-- 1. test full spec
+create table analyze_srcpart like srcpart
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table analyze_srcpart like srcpart
+POSTHOOK: query: -- test analyze table ... compute statistics noscan
+
+-- 1. test full spec
+create table analyze_srcpart like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@analyze_srcpart
 PREHOOK: query: insert overwrite table analyze_srcpart partition (ds, hr) select * from srcpart where ds is not null
@@ -95,9 +101,11 @@ POSTHOOK: Lineage: analyze_srcpart PARTI
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
+PREHOOK: query: -- confirm result
+describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
 PREHOOK: type: DESCTABLE
-POSTHOOK: query: describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
+POSTHOOK: query: -- confirm result
+describe formatted analyze_srcpart PARTITION(ds='2008-04-08',hr=11)
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
@@ -339,9 +347,11 @@ POSTHOOK: Lineage: analyze_srcpart PARTI
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: create table analyze_srcpart_partial like srcpart
+PREHOOK: query: -- 2. test partial spec
+create table analyze_srcpart_partial like srcpart
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table analyze_srcpart_partial like srcpart
+POSTHOOK: query: -- 2. test partial spec
+create table analyze_srcpart_partial like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@analyze_srcpart_partial
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
@@ -452,9 +462,11 @@ POSTHOOK: Lineage: analyze_srcpart_parti
 POSTHOOK: Lineage: analyze_srcpart_partial PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart_partial PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart_partial PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
+PREHOOK: query: -- confirm result
+describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
 PREHOOK: type: DESCTABLE
-POSTHOOK: query: describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
+POSTHOOK: query: -- confirm result
+describe formatted analyze_srcpart_partial PARTITION(ds='2008-04-08',hr=11)
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_noscan_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_noscan_2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_noscan_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_noscan_2.q.out Wed Apr 10 00:06:55 2013
@@ -1,5 +1,9 @@
+PREHOOK: query: -- test analyze table compute statistiscs [noscan] on external table 
+-- 1 test table
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- test analyze table compute statistiscs [noscan] on external table 
+-- 1 test table
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@anaylyze_external
@@ -109,9 +113,13 @@ POSTHOOK: query: drop table anaylyze_ext
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@anaylyze_external
 POSTHOOK: Output: default@anaylyze_external
-PREHOOK: query: create table texternal(key string, val string) partitioned by (insertdate string)
+PREHOOK: query: -- 2 test partition
+-- prepare data
+create table texternal(key string, val string) partitioned by (insertdate string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table texternal(key string, val string) partitioned by (insertdate string)
+POSTHOOK: query: -- 2 test partition
+-- prepare data
+create table texternal(key string, val string) partitioned by (insertdate string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@texternal
 #### A masked pattern was here ####
@@ -144,8 +152,10 @@ POSTHOOK: Input: default@texternal@inser
 POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 500
+PREHOOK: query: -- create external table
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- create external table
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@anaylyze_external
@@ -173,13 +183,15 @@ POSTHOOK: Input: default@anaylyze_extern
 POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 500
-PREHOOK: query: analyze table anaylyze_external PARTITION (insertdate='2008-01-01') compute statistics
+PREHOOK: query: -- analyze
+analyze table anaylyze_external PARTITION (insertdate='2008-01-01') compute statistics
 PREHOOK: type: QUERY
 PREHOOK: Input: default@anaylyze_external
 PREHOOK: Input: default@anaylyze_external@insertdate=2008-01-01
 PREHOOK: Output: default@anaylyze_external
 PREHOOK: Output: default@anaylyze_external@insertdate=2008-01-01
-POSTHOOK: query: analyze table anaylyze_external PARTITION (insertdate='2008-01-01') compute statistics
+POSTHOOK: query: -- analyze
+analyze table anaylyze_external PARTITION (insertdate='2008-01-01') compute statistics
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@anaylyze_external
 POSTHOOK: Input: default@anaylyze_external@insertdate=2008-01-01

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,14 @@
-PREHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
+PREHOOK: query: -- test analyze table ... compute statistics partialscan
+
+-- 1. prepare data
+CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
 partitioned by (ds string, hr string)
 stored as rcfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
+POSTHOOK: query: -- test analyze table ... compute statistics partialscan
+
+-- 1. prepare data
+CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
 partitioned by (ds string, hr string)
 stored as rcfile
 POSTHOOK: type: CREATETABLE
@@ -77,10 +83,12 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: explain
+PREHOOK: query: -- 2. partialscan
+explain
 analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- 2. partialscan
+explain
 analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
@@ -126,9 +134,11 @@ POSTHOOK: Lineage: analyze_srcpart_parti
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
+PREHOOK: query: -- 3. confirm result
+describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
 PREHOOK: type: DESCTABLE
-POSTHOOK: query: describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
+POSTHOOK: query: -- 3. confirm result
+describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11)
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-08,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,18 @@
-PREHOOK: query: create table tmptable(key string, value string)
+PREHOOK: query: -- In this test, there is a dummy stats publisher which throws an error when various
+-- methods are called (as indicated by the parameter hive.test.dummystats.publisher)
+-- Since stats need not be reliable (by setting hive.stats.reliable to false), the
+-- insert statements succeed. The insert statement succeeds even if the stats publisher
+-- is set to null, since stats need not be reliable.
+
+create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table tmptable(key string, value string)
+POSTHOOK: query: -- In this test, there is a dummy stats publisher which throws an error when various
+-- methods are called (as indicated by the parameter hive.test.dummystats.publisher)
+-- Since stats need not be reliable (by setting hive.stats.reliable to false), the
+-- insert statements succeed. The insert statement succeeds even if the stats publisher
+-- is set to null, since stats need not be reliable.
+
+create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: INSERT OVERWRITE TABLE tmptable select * from src

Modified: hive/trunk/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/table_access_keys_stats.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/table_access_keys_stats.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/table_access_keys_stats.q.out Wed Apr 10 00:06:55 2013
@@ -1,4 +1,6 @@
-PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
+PREHOOK: query: -- This test is used for testing the TableAccessAnalyzer
+
+CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE T1
 PREHOOK: type: LOAD
@@ -7,7 +9,8 @@ PREHOOK: query: CREATE TABLE T2(key STRI
 PREHOOK: type: CREATETABLE
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
-PREHOOK: query: SELECT key, count(1) FROM T1 GROUP BY key
+PREHOOK: query: -- Simple group-by queries
+SELECT key, count(1) FROM T1 GROUP BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -34,7 +37,8 @@ Keys:key,val
 7	17	1
 8	18	1
 8	28	1
-PREHOOK: query: SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 GROUP BY key
+PREHOOK: query: -- With subqueries and column aliases
+SELECT key, count(1) FROM (SELECT key, val FROM T1) subq1 GROUP BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -60,7 +64,8 @@ Keys:key
 3	1
 7	1
 8	2
-PREHOOK: query: SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
+PREHOOK: query: -- With constants
+SELECT 1, key, count(1) FROM T1 GROUP BY 1, key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -101,7 +106,8 @@ Keys:key,val
 7	1	17	2	1
 8	1	18	2	1
 8	1	28	2	1
-PREHOOK: query: SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
+PREHOOK: query: -- no mapping with functions
+SELECT key, key + 1, count(1) FROM T1 GROUP BY key, key + 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 #### A masked pattern was here ####
@@ -125,7 +131,8 @@ Keys:key
 6.0	1
 14.0	1
 16.0	2
-PREHOOK: query: SELECT * FROM (
+PREHOOK: query: -- group by followed by union
+SELECT * FROM (
 SELECT key, count(1) as c FROM T1 GROUP BY key
  UNION ALL
 SELECT key, count(1) as c FROM T1 GROUP BY key
@@ -151,7 +158,8 @@ Keys:key
 3	1
 7	1
 8	2
-PREHOOK: query: SELECT * FROM
+PREHOOK: query: -- group by followed by a join
+SELECT * FROM
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq1
 JOIN
 (SELECT key, count(1) as c FROM T1 GROUP BY key) subq2
@@ -195,7 +203,8 @@ Keys:key
 7	1	7	17	1
 8	2	8	18	1
 8	2	8	28	1
-PREHOOK: query: SELECT key, constant, val, count(1) from
+PREHOOK: query: -- constants from sub-queries should work fine
+SELECT key, constant, val, count(1) from
 (SELECT key, 1 as constant, val from T1) subq1
 group by key, constant, val
 PREHOOK: type: QUERY
@@ -211,7 +220,8 @@ Keys:key,val
 7	1	17	1
 8	1	18	1
 8	1	28	1
-PREHOOK: query: SELECT key, constant3, val, count(1) FROM
+PREHOOK: query: -- multiple levels of constants from sub-queries should work fine
+SELECT key, constant3, val, count(1) FROM
 (
   SELECT key, constant AS constant2, val, 2 AS constant3
   FROM
@@ -234,7 +244,8 @@ Keys:key,val
 7	2	17	1
 8	2	18	1
 8	2	28	1
-PREHOOK: query: FROM T1
+PREHOOK: query: -- work with insert overwrite
+FROM T1
 INSERT OVERWRITE TABLE T2 SELECT key, count(1) GROUP BY key, 1
 INSERT OVERWRITE TABLE T3 SELECT key, sum(val) GROUP BY key
 PREHOOK: type: QUERY
@@ -249,7 +260,8 @@ Operator:GBY_8
 Table:default@t1
 Keys:key
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- simple joins
+SELECT *
 FROM T1 JOIN T2
 ON T1.key = t2.key
 ORDER BY T1.key ASC, T1.val ASC
@@ -282,7 +294,8 @@ Keys:key,val
 Table:default@t1
 Keys:key,val
 
-PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * 
+PREHOOK: query: -- map join
+SELECT /*+ MAPJOIN(a) */ * 
 FROM T1 a JOIN T2 b 
 ON a.key = b.key
 PREHOOK: type: QUERY
@@ -301,7 +314,8 @@ Keys:key
 7	17	7	1
 8	18	8	2
 8	28	8	2
-PREHOOK: query: SELECT *
+PREHOOK: query: -- with constant in join condition
+SELECT *
 FROM T1 JOIN T2
 ON T1.key = T2.key AND T1.val = 3 and T2.val = 3
 PREHOOK: type: QUERY
@@ -314,7 +328,8 @@ Keys:key
 Table:default@t1
 Keys:key
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- subqueries
+SELECT *
 FROM 
 (
   SELECT val FROM T1 WHERE key = 5  
@@ -352,7 +367,8 @@ Keys:val
 Table:default@t1
 Keys:val
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- with column aliases in subqueries
+SELECT *
 FROM
 (
   SELECT val as v FROM T1 WHERE key = 5
@@ -372,7 +388,8 @@ Keys:val
 Table:default@t1
 Keys:val
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- with constants in subqueries
+SELECT *
 FROM
 (
   SELECT key, val FROM T1
@@ -392,7 +409,8 @@ Keys:key
 Table:default@t1
 Keys:val,key
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- multiple levels of constants in subqueries
+SELECT *
 FROM
 (
   SELECT key, val from 
@@ -415,7 +433,8 @@ Keys:val,key
 Table:default@t1
 Keys:key
 
-PREHOOK: query: SELECT *
+PREHOOK: query: -- no mapping on functions
+SELECT *
 FROM
 (
   SELECT key, val from T1
@@ -429,7 +448,8 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-PREHOOK: query: SELECT subq1.val, COUNT(*)
+PREHOOK: query: -- join followed by group by
+SELECT subq1.val, COUNT(*)
 FROM
 (
   SELECT key, val FROM T1
@@ -450,7 +470,8 @@ Keys:key
 Table:default@t1
 Keys:val,key
 
-PREHOOK: query: SELECT * 
+PREHOOK: query: -- join followed by union
+SELECT * 
 FROM
 (
   SELECT subq1.val, COUNT(*)
@@ -489,7 +510,8 @@ Keys:val,key
 13.0	1
 17.0	1
 46.0	1
-PREHOOK: query: SELECT *
+PREHOOK: query: -- join followed by join
+SELECT *
 FROM
 (
   SELECT subq1.val as val, COUNT(*)

Modified: hive/trunk/ql/src/test/results/clientpositive/timestamp_udf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/timestamp_udf.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/timestamp_udf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/timestamp_udf.q.out Wed Apr 10 00:06:55 2013
@@ -36,13 +36,15 @@ POSTHOOK: Output: default@timestamp_udf
 POSTHOOK: Output: default@timestamp_udf_string
 POSTHOOK: Lineage: timestamp_udf.t EXPRESSION []
 POSTHOOK: Lineage: timestamp_udf_string.t SIMPLE []
-PREHOOK: query: select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t),
+PREHOOK: query: -- Test UDFs with Timestamp input
+select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t),
     weekofyear(t), hour(t), minute(t), second(t), to_date(t)
   from timestamp_udf
 PREHOOK: type: QUERY
 PREHOOK: Input: default@timestamp_udf
 #### A masked pattern was here ####
-POSTHOOK: query: select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t),
+POSTHOOK: query: -- Test UDFs with Timestamp input
+select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t),
     weekofyear(t), hour(t), minute(t), second(t), to_date(t)
   from timestamp_udf
 POSTHOOK: type: QUERY
@@ -155,13 +157,15 @@ POSTHOOK: Input: default@timestamp_udf
 POSTHOOK: Lineage: timestamp_udf.t EXPRESSION []
 POSTHOOK: Lineage: timestamp_udf_string.t SIMPLE []
 2011-05-06 07:08:09.1234567	2011-05-06 12:08:09.1234567	2011-05-06 07:08:09.1234567	2011-05-06 12:08:09.1234567
-PREHOOK: query: select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t), 
+PREHOOK: query: -- Test UDFs with string input
+select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t), 
     weekofyear(t), hour(t), minute(t), second(t), to_date(t)
   from timestamp_udf_string
 PREHOOK: type: QUERY
 PREHOOK: Input: default@timestamp_udf_string
 #### A masked pattern was here ####
-POSTHOOK: query: select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t), 
+POSTHOOK: query: -- Test UDFs with string input
+select unix_timestamp(t), year(t), month(t), day(t), dayofmonth(t), 
     weekofyear(t), hour(t), minute(t), second(t), to_date(t)
   from timestamp_udf_string
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/transform2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform2.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,10 @@
-PREHOOK: query: SELECT TRANSFORM(substr(key, 1, 2)) USING 'cat' FROM src LIMIT 1
+PREHOOK: query: -- Transform with a function that has many parameters
+SELECT TRANSFORM(substr(key, 1, 2)) USING 'cat' FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT TRANSFORM(substr(key, 1, 2)) USING 'cat' FROM src LIMIT 1
+POSTHOOK: query: -- Transform with a function that has many parameters
+SELECT TRANSFORM(substr(key, 1, 2)) USING 'cat' FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/truncate_table.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/truncate_table.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/truncate_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/truncate_table.q.out Wed Apr 10 00:06:55 2013
@@ -66,9 +66,11 @@ PREHOOK: Output: default@srcpart_truncat
 POSTHOOK: query: load data local inpath '../data/files/kv1.txt' into table srcpart_truncate partition (ds='2008-04-09', hr='12')
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@srcpart_truncate@ds=2008-04-09/hr=12
-PREHOOK: query: explain TRUNCATE TABLE src_truncate
+PREHOOK: query: -- truncate non-partitioned table
+explain TRUNCATE TABLE src_truncate
 PREHOOK: type: TRUNCATETABLE
-POSTHOOK: query: explain TRUNCATE TABLE src_truncate
+POSTHOOK: query: -- truncate non-partitioned table
+explain TRUNCATE TABLE src_truncate
 POSTHOOK: type: TRUNCATETABLE
 ABSTRACT SYNTAX TREE:
   (TOK_TRUNCATETABLE (TOK_TABLE_PARTITION src_truncate))
@@ -97,9 +99,11 @@ POSTHOOK: query: select * from src_trunc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_truncate
 #### A masked pattern was here ####
-PREHOOK: query: explain TRUNCATE TABLE srcpart_truncate partition (ds='2008-04-08', hr='11')
+PREHOOK: query: -- truncate a partition
+explain TRUNCATE TABLE srcpart_truncate partition (ds='2008-04-08', hr='11')
 PREHOOK: type: TRUNCATETABLE
-POSTHOOK: query: explain TRUNCATE TABLE srcpart_truncate partition (ds='2008-04-08', hr='11')
+POSTHOOK: query: -- truncate a partition
+explain TRUNCATE TABLE srcpart_truncate partition (ds='2008-04-08', hr='11')
 POSTHOOK: type: TRUNCATETABLE
 ABSTRACT SYNTAX TREE:
   (TOK_TRUNCATETABLE (TOK_TABLE_PARTITION srcpart_truncate (TOK_PARTSPEC (TOK_PARTVAL ds '2008-04-08') (TOK_PARTVAL hr '11'))))
@@ -133,9 +137,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_truncate
 POSTHOOK: Input: default@srcpart_truncate@ds=2008-04-08/hr=11
 #### A masked pattern was here ####
-PREHOOK: query: explain TRUNCATE TABLE srcpart_truncate partition (ds, hr='12')
+PREHOOK: query: -- truncate partitions with partial spec
+explain TRUNCATE TABLE srcpart_truncate partition (ds, hr='12')
 PREHOOK: type: TRUNCATETABLE
-POSTHOOK: query: explain TRUNCATE TABLE srcpart_truncate partition (ds, hr='12')
+POSTHOOK: query: -- truncate partitions with partial spec
+explain TRUNCATE TABLE srcpart_truncate partition (ds, hr='12')
 POSTHOOK: type: TRUNCATETABLE
 ABSTRACT SYNTAX TREE:
   (TOK_TRUNCATETABLE (TOK_TABLE_PARTITION srcpart_truncate (TOK_PARTSPEC (TOK_PARTVAL ds) (TOK_PARTVAL hr '12'))))
@@ -173,9 +179,11 @@ POSTHOOK: Input: default@srcpart_truncat
 POSTHOOK: Input: default@srcpart_truncate@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart_truncate@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-PREHOOK: query: explain TRUNCATE TABLE srcpart_truncate
+PREHOOK: query: -- truncate partitioned table
+explain TRUNCATE TABLE srcpart_truncate
 PREHOOK: type: TRUNCATETABLE
-POSTHOOK: query: explain TRUNCATE TABLE srcpart_truncate
+POSTHOOK: query: -- truncate partitioned table
+explain TRUNCATE TABLE srcpart_truncate
 POSTHOOK: type: TRUNCATETABLE
 ABSTRACT SYNTAX TREE:
   (TOK_TRUNCATETABLE (TOK_TABLE_PARTITION srcpart_truncate))

Modified: hive/trunk/ql/src/test/results/clientpositive/type_widening.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/type_widening.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/type_widening.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/type_widening.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,8 @@
-PREHOOK: query: EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1
+PREHOOK: query: -- Check for int, bigint automatic type widening conversions in UDFs, UNIONS
+EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1
+POSTHOOK: query: -- Check for int, bigint automatic type widening conversions in UDFs, UNIONS
+EXPLAIN SELECT COALESCE(0, 9223372036854775807) FROM src LIMIT 1
 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 COALESCE 0 9223372036854775807))) (TOK_LIMIT 1)))

Modified: hive/trunk/ql/src/test/results/clientpositive/udaf_percentile_approx.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udaf_percentile_approx.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udaf_percentile_approx.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udaf_percentile_approx.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,10 @@
-PREHOOK: query: SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
+PREHOOK: query: -- disable map-side aggregation
+SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
+POSTHOOK: query: -- disable map-side aggregation
+SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -106,11 +108,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 [26.0,255.5,479.0,491.0]
-PREHOOK: query: SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
+PREHOOK: query: -- enable map-side aggregation
+SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
+POSTHOOK: query: -- enable map-side aggregation
+SELECT percentile_approx(cast(substr(src.value,5) AS double), 0.5) FROM src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_array_contains.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_array_contains.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_array_contains.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_array_contains.q.out Wed Apr 10 00:06:55 2013
@@ -11,21 +11,25 @@ array_contains(array, value) - Returns T
 Example:
   > SELECT array_contains(array(1, 2, 3), 2) FROM src LIMIT 1;
   true
-PREHOOK: query: SELECT array_contains(array(1, 2, 3), 1) FROM src LIMIT 1
+PREHOOK: query: -- evalutes function for array of primitives
+SELECT array_contains(array(1, 2, 3), 1) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT array_contains(array(1, 2, 3), 1) FROM src LIMIT 1
+POSTHOOK: query: -- evalutes function for array of primitives
+SELECT array_contains(array(1, 2, 3), 1) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 true
-PREHOOK: query: SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2))
+PREHOOK: query: -- evaluates function for nested arrays
+SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2))
 FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2))
+POSTHOOK: query: -- evaluates function for nested arrays
+SELECT array_contains(array(array(1,2), array(2,3), array(3,4)), array(1,2))
 FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_bin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_bin.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_bin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_bin.q.out Wed Apr 10 00:06:55 2013
@@ -29,11 +29,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 1	0	101111101011100001101100101
-PREHOOK: query: SELECT bin(-5) FROM src LIMIT 1
+PREHOOK: query: -- Negative numbers should be treated as two's complement (64 bit).
+SELECT bin(-5) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT bin(-5) FROM src LIMIT 1
+POSTHOOK: query: -- Negative numbers should be treated as two's complement (64 bit).
+SELECT bin(-5) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_case.q.out Wed Apr 10 00:06:55 2013
@@ -165,13 +165,17 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 2	5	15	NULL	20	24
-PREHOOK: query: SELECT CASE 1 WHEN 1 THEN 'yo'
+PREHOOK: query: -- verify that short-circuiting is working correctly for CASE
+-- we should never get to the ELSE branch, which would raise an exception
+SELECT CASE 1 WHEN 1 THEN 'yo'
 ELSE reflect('java.lang.String', 'bogus', 1) END
 FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT CASE 1 WHEN 1 THEN 'yo'
+POSTHOOK: query: -- verify that short-circuiting is working correctly for CASE
+-- we should never get to the ELSE branch, which would raise an exception
+SELECT CASE 1 WHEN 1 THEN 'yo'
 ELSE reflect('java.lang.String', 'bogus', 1) END
 FROM src LIMIT 1
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_concat_ws.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_concat_ws.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_concat_ws.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_concat_ws.q.out Wed Apr 10 00:06:55 2013
@@ -97,7 +97,8 @@ POSTHOOK: Lineage: dest1.c1 SIMPLE []
 POSTHOOK: Lineage: dest1.c2 SIMPLE []
 POSTHOOK: Lineage: dest1.c3 SIMPLE []
 xyzabc8675309	abc,xyz,8675309	NULL	abc**8675309
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- evalutes function for array of strings
+EXPLAIN
 SELECT concat_ws('.', array('www', 'face', 'book', 'com'), '1234'),
        concat_ws('-', 'www', array('face', 'book', 'com'), '1234'),
        concat_ws('F', 'www', array('face', 'book', 'com', '1234')),
@@ -106,7 +107,8 @@ SELECT concat_ws('.', array('www', 'face
        concat_ws('[]', array('www'), 'face', array('book', 'com', '1234')),
        concat_ws('AAA', array('www'), array('face', 'book', 'com'), '1234') FROM dest1 LIMIT 1
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- evalutes function for array of strings
+EXPLAIN
 SELECT concat_ws('.', array('www', 'face', 'book', 'com'), '1234'),
        concat_ws('-', 'www', array('face', 'book', 'com'), '1234'),
        concat_ws('F', 'www', array('face', 'book', 'com', '1234')),

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_conv.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_conv.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_conv.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_conv.q.out Wed Apr 10 00:06:55 2013
@@ -14,7 +14,10 @@ Example:
   '4'
   > SELECT conv(-10, 16, -10) FROM src LIMIT 1;
   '16'
-PREHOOK: query: SELECT
+PREHOOK: query: -- conv must work on both strings and integers up to 64-bit precision
+
+-- Some simple conversions to test different bases
+SELECT
   conv('4521', 10, 36),
   conv('22', 10, 10),
   conv('110011', 2, 16),
@@ -23,7 +26,10 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- conv must work on both strings and integers up to 64-bit precision
+
+-- Some simple conversions to test different bases
+SELECT
   conv('4521', 10, 36),
   conv('22', 10, 10),
   conv('110011', 2, 16),
@@ -33,7 +39,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 3HL	22	33	116ED2B2FB4
-PREHOOK: query: SELECT
+PREHOOK: query: -- Test negative numbers. If to_base is positive, the number should be handled
+-- as a two's complement (64-bit)
+SELECT
   conv('-641', 10, -10),
   conv('1011', 2, -16),
   conv('-1', 10, 16),
@@ -42,7 +50,9 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- Test negative numbers. If to_base is positive, the number should be handled
+-- as a two's complement (64-bit)
+SELECT
   conv('-641', 10, -10),
   conv('1011', 2, -16),
   conv('-1', 10, 16),
@@ -52,7 +62,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -641	B	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFF1
-PREHOOK: query: SELECT
+PREHOOK: query: -- Test overflow. If a number is two large, the result should be -1 (if signed)
+-- or MAX_LONG (if unsigned)
+SELECT
   conv('9223372036854775807', 36, 16),
   conv('9223372036854775807', 36, -16),
   conv('-9223372036854775807', 36, 16),
@@ -61,7 +73,9 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- Test overflow. If a number is two large, the result should be -1 (if signed)
+-- or MAX_LONG (if unsigned)
+SELECT
   conv('9223372036854775807', 36, 16),
   conv('9223372036854775807', 36, -16),
   conv('-9223372036854775807', 36, 16),
@@ -71,7 +85,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 FFFFFFFFFFFFFFFF	-1	FFFFFFFFFFFFFFFF	-1
-PREHOOK: query: SELECT
+PREHOOK: query: -- Test with invalid input. If one of the bases is invalid, the result should
+-- be NULL. If there is an invalid digit in the number, the longest valid
+-- prefix should be converted.
+SELECT
   conv('123455', 3, 10),
   conv('131', 1, 5),
   conv('515', 5, 100),
@@ -80,7 +97,10 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- Test with invalid input. If one of the bases is invalid, the result should
+-- be NULL. If there is an invalid digit in the number, the longest valid
+-- prefix should be converted.
+SELECT
   conv('123455', 3, 10),
   conv('131', 1, 5),
   conv('515', 5, 100),
@@ -90,7 +110,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 5	NULL	NULL	NULL
-PREHOOK: query: SELECT
+PREHOOK: query: -- Perform the same tests with number arguments.
+
+SELECT
   conv(4521, 10, 36),
   conv(22, 10, 10),
   conv(110011, 2, 16)
@@ -98,7 +120,9 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- Perform the same tests with number arguments.
+
+SELECT
   conv(4521, 10, 36),
   conv(22, 10, 10),
   conv(110011, 2, 16)
@@ -164,13 +188,17 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 5	NULL	NULL	NULL
-PREHOOK: query: SELECT conv(key, 10, 16),
+PREHOOK: query: -- Make sure that state is properly reset.
+
+SELECT conv(key, 10, 16),
        conv(key, 16, 10)
 FROM src LIMIT 3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT conv(key, 10, 16),
+POSTHOOK: query: -- Make sure that state is properly reset.
+
+SELECT conv(key, 10, 16),
        conv(key, 16, 10)
 FROM src LIMIT 3
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_format_number.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_format_number.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_format_number.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_format_number.q.out Wed Apr 10 00:06:55 2013
@@ -2,9 +2,13 @@ PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: DESCRIBE FUNCTION format_number
+PREHOOK: query: -- Test format_number() UDF
+
+DESCRIBE FUNCTION format_number
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION format_number
+POSTHOOK: query: -- Test format_number() UDF
+
+DESCRIBE FUNCTION format_number
 POSTHOOK: type: DESCFUNCTION
 format_number(X, D) - Formats the number X to a format like '#,###,###.##', rounded to D decimal places, and returns the result as a string. If D is 0, the result has no decimal point or fractional part. This is supposed to function like MySQL's FORMAT
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED format_number
@@ -76,7 +80,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 12,332.1235	12,332.1000	12,332
-PREHOOK: query: SELECT format_number(0.123456789, 12),
+PREHOOK: query: -- positive numbers
+SELECT format_number(0.123456789, 12),
     format_number(12345678.123456789, 5),
     format_number(1234567.123456789, 7),
     format_number(123456.123456789, 0)
@@ -84,7 +89,8 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT format_number(0.123456789, 12),
+POSTHOOK: query: -- positive numbers
+SELECT format_number(0.123456789, 12),
     format_number(12345678.123456789, 5),
     format_number(1234567.123456789, 7),
     format_number(123456.123456789, 0)
@@ -93,7 +99,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0.123456789000	12,345,678.12346	1,234,567.1234568	123,456
-PREHOOK: query: SELECT format_number(-123456.123456789, 0),
+PREHOOK: query: -- negative numbers
+SELECT format_number(-123456.123456789, 0),
     format_number(-1234567.123456789, 2),
     format_number(-0.123456789, 15),
     format_number(-12345.123456789, 4)
@@ -101,7 +108,8 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT format_number(-123456.123456789, 0),
+POSTHOOK: query: -- negative numbers
+SELECT format_number(-123456.123456789, 0),
     format_number(-1234567.123456789, 2),
     format_number(-0.123456789, 15),
     format_number(-12345.123456789, 4)
@@ -110,7 +118,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -123,456	-1,234,567.12	-0.123456789000000	-12,345.1235
-PREHOOK: query: SELECT format_number(0.0, 4),
+PREHOOK: query: -- zeros
+SELECT format_number(0.0, 4),
     format_number(0.000000, 1),
     format_number(000.0000, 1),
     format_number(00000.0000, 1),
@@ -119,7 +128,8 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT format_number(0.0, 4),
+POSTHOOK: query: -- zeros
+SELECT format_number(0.0, 4),
     format_number(0.000000, 1),
     format_number(000.0000, 1),
     format_number(00000.0000, 1),
@@ -129,7 +139,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0.0000	0.0	0.0	0.0	-0.0000
-PREHOOK: query: SELECT format_number(0, 0),
+PREHOOK: query: -- integers
+SELECT format_number(0, 0),
     format_number(1, 4),
     format_number(12, 2),
     format_number(123, 5),
@@ -138,7 +149,8 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT format_number(0, 0),
+POSTHOOK: query: -- integers
+SELECT format_number(0, 0),
     format_number(1, 4),
     format_number(12, 2),
     format_number(123, 5),
@@ -148,7 +160,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0	1.0000	12.00	123.00000	1,234.0000000
-PREHOOK: query: SELECT format_number(-9223372036854775807, 10),
+PREHOOK: query: -- long and double boundary
+-- 9223372036854775807 is LONG_MAX
+-- -9223372036854775807 is one more than LONG_MIN,
+-- due to HIVE-2733, put it here to check LONG_MIN boundary
+-- 4.9E-324 and 1.7976931348623157E308 are Double.MIN_VALUE and Double.MAX_VALUE
+-- check them for Double boundary
+SELECT format_number(-9223372036854775807, 10),
     format_number(9223372036854775807, 20),
     format_number(4.9E-324, 324),
     format_number(1.7976931348623157E308, 308)
@@ -156,7 +174,13 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT format_number(-9223372036854775807, 10),
+POSTHOOK: query: -- long and double boundary
+-- 9223372036854775807 is LONG_MAX
+-- -9223372036854775807 is one more than LONG_MIN,
+-- due to HIVE-2733, put it here to check LONG_MIN boundary
+-- 4.9E-324 and 1.7976931348623157E308 are Double.MIN_VALUE and Double.MAX_VALUE
+-- check them for Double boundary
+SELECT format_number(-9223372036854775807, 10),
     format_number(9223372036854775807, 20),
     format_number(4.9E-324, 324),
     format_number(1.7976931348623157E308, 308)

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_get_json_object.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_get_json_object.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_get_json_object.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_get_json_object.q.out Wed Apr 10 00:06:55 2013
@@ -173,9 +173,13 @@ POSTHOOK: Input: default@src_json
 #### A masked pattern was here ####
 POSTHOOK: Lineage: dest1.c1 SIMPLE []
 1234
-PREHOOK: query: CREATE TABLE dest2(c1 STRING) STORED AS RCFILE
+PREHOOK: query: -- Verify that get_json_object can handle new lines in JSON values
+
+CREATE TABLE dest2(c1 STRING) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE dest2(c1 STRING) STORED AS RCFILE
+POSTHOOK: query: -- Verify that get_json_object can handle new lines in JSON values
+
+CREATE TABLE dest2(c1 STRING) STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@dest2
 POSTHOOK: Lineage: dest1.c1 SIMPLE []

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_hex.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_hex.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_hex.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_hex.q.out Wed Apr 10 00:06:55 2013
@@ -15,7 +15,9 @@ Example:
   'H1'
   > SELECT hex('Facebook') FROM src LIMIT 1;
   '46616365626F6F6B'
-PREHOOK: query: SELECT
+PREHOOK: query: -- If the argument is a string, hex should return a string containing two hex
+-- digits for every character in the input.
+SELECT
   hex('Facebook'),
   hex('\0'),
   hex('qwertyuiopasdfghjkl')
@@ -23,7 +25,9 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- If the argument is a string, hex should return a string containing two hex
+-- digits for every character in the input.
+SELECT
   hex('Facebook'),
   hex('\0'),
   hex('qwertyuiopasdfghjkl')
@@ -32,7 +36,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 46616365626F6F6B	00	71776572747975696F706173646667686A6B6C
-PREHOOK: query: SELECT
+PREHOOK: query: -- If the argument is a number, hex should convert it to hexadecimal.
+SELECT
   hex(1),
   hex(0),
   hex(4207849477)
@@ -40,7 +45,8 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT
+POSTHOOK: query: -- If the argument is a number, hex should convert it to hexadecimal.
+SELECT
   hex(1),
   hex(0),
   hex(4207849477)
@@ -49,11 +55,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 1	0	FACEB005
-PREHOOK: query: SELECT hex(-5) FROM src LIMIT 1
+PREHOOK: query: -- Negative numbers should be treated as two's complement (64 bit).
+SELECT hex(-5) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT hex(-5) FROM src LIMIT 1
+POSTHOOK: query: -- Negative numbers should be treated as two's complement (64 bit).
+SELECT hex(-5) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_if.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_if.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_if.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_if.q.out Wed Apr 10 00:06:55 2013
@@ -89,14 +89,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 1	1	1	1	NULL	2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- Type conversions
+EXPLAIN
 SELECT IF(TRUE, CAST(128 AS SMALLINT), CAST(1 AS TINYINT)) AS COL1,
        IF(FALSE, 1, 1.1) AS COL2,
        IF(FALSE, 1, 'ABC') AS COL3,
        IF(FALSE, 'ABC', 12.3) AS COL4
 FROM src LIMIT 1
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- Type conversions
+EXPLAIN
 SELECT IF(TRUE, CAST(128 AS SMALLINT), CAST(1 AS TINYINT)) AS COL1,
        IF(FALSE, 1, 1.1) AS COL2,
        IF(FALSE, 1, 'ABC') AS COL3,

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_java_method.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_java_method.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_java_method.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_java_method.q.out Wed Apr 10 00:06:55 2013
@@ -11,7 +11,9 @@ java_method(class,method[,arg1[,arg2..]]
 Synonyms: reflect
 Use this UDF to call Java methods by matching the argument signature
 
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- java_method() is a synonym for reflect()
+
+EXPLAIN EXTENDED
 SELECT java_method("java.lang.String", "valueOf", 1),
        java_method("java.lang.String", "isEmpty"),
        java_method("java.lang.Math", "max", 2, 3),
@@ -21,7 +23,9 @@ SELECT java_method("java.lang.String", "
        java_method("java.lang.Math", "floor", 1.9)
 FROM src LIMIT 1
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- java_method() is a synonym for reflect()
+
+EXPLAIN EXTENDED
 SELECT java_method("java.lang.String", "valueOf", 1),
        java_method("java.lang.String", "isEmpty"),
        java_method("java.lang.Math", "max", 2, 3),

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_length.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_length.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_length.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_length.q.out Wed Apr 10 00:06:55 2013
@@ -161,9 +161,11 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@dest1
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
+PREHOOK: query: -- Test with non-ascii characters. 
+CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- Test with non-ascii characters. 
+CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_map_keys.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_map_keys.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_map_keys.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_map_keys.q.out Wed Apr 10 00:06:55 2013
@@ -2,9 +2,13 @@ PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: DESCRIBE FUNCTION map_keys
+PREHOOK: query: -- Test map_keys() UDF
+
+DESCRIBE FUNCTION map_keys
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION map_keys
+POSTHOOK: query: -- Test map_keys() UDF
+
+DESCRIBE FUNCTION map_keys
 POSTHOOK: type: DESCFUNCTION
 map_keys(map) - Returns an unordered array containing the keys of the input map.
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED map_keys
@@ -12,20 +16,24 @@ PREHOOK: type: DESCFUNCTION
 POSTHOOK: query: DESCRIBE FUNCTION EXTENDED map_keys
 POSTHOOK: type: DESCFUNCTION
 map_keys(map) - Returns an unordered array containing the keys of the input map.
-PREHOOK: query: SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
+PREHOOK: query: -- Evaluate function against INT valued keys
+SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
+POSTHOOK: query: -- Evaluate function against INT valued keys
+SELECT map_keys(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 [1,2,3]
-PREHOOK: query: SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
+PREHOOK: query: -- Evaluate function against STRING valued keys
+SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
+POSTHOOK: query: -- Evaluate function against STRING valued keys
+SELECT map_keys(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_map_values.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_map_values.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_map_values.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_map_values.q.out Wed Apr 10 00:06:55 2013
@@ -2,9 +2,13 @@ PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: DESCRIBE FUNCTION map_values
+PREHOOK: query: -- Test map_values() UDF
+
+DESCRIBE FUNCTION map_values
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION map_values
+POSTHOOK: query: -- Test map_values() UDF
+
+DESCRIBE FUNCTION map_values
 POSTHOOK: type: DESCFUNCTION
 map_values(map) - Returns an unordered array containing the values of the input map.
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED map_values
@@ -12,20 +16,24 @@ PREHOOK: type: DESCFUNCTION
 POSTHOOK: query: DESCRIBE FUNCTION EXTENDED map_values
 POSTHOOK: type: DESCFUNCTION
 map_values(map) - Returns an unordered array containing the values of the input map.
-PREHOOK: query: SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
+PREHOOK: query: -- Evaluate function against STRING valued values
+SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
+POSTHOOK: query: -- Evaluate function against STRING valued values
+SELECT map_values(map(1, "a", 2, "b", 3, "c")) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 ["a","b","c"]
-PREHOOK: query: SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
+PREHOOK: query: -- Evaluate function against INT valued keys
+SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
+POSTHOOK: query: -- Evaluate function against INT valued keys
+SELECT map_values(map("a", 1, "b", 2, "c", 3)) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_negative.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_negative.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_negative.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_negative.q.out Wed Apr 10 00:06:55 2013
@@ -8,9 +8,11 @@ PREHOOK: type: DESCFUNCTION
 POSTHOOK: query: DESCRIBE FUNCTION EXTENDED negative
 POSTHOOK: type: DESCFUNCTION
 negative a - Returns -a
-PREHOOK: query: DESCRIBE FUNCTION -
+PREHOOK: query: -- synonym
+DESCRIBE FUNCTION -
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION -
+POSTHOOK: query: -- synonym
+DESCRIBE FUNCTION -
 POSTHOOK: type: DESCFUNCTION
 a - b - Returns the difference a-b
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED -

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_not.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_not.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_not.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_not.q.out Wed Apr 10 00:06:55 2013
@@ -9,9 +9,11 @@ POSTHOOK: query: DESCRIBE FUNCTION EXTEN
 POSTHOOK: type: DESCFUNCTION
 not a - Logical not
 Synonyms: !
-PREHOOK: query: DESCRIBE FUNCTION !
+PREHOOK: query: -- synonym
+DESCRIBE FUNCTION !
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION !
+POSTHOOK: query: -- synonym
+DESCRIBE FUNCTION !
 POSTHOOK: type: DESCFUNCTION
 ! a - Logical not
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED !

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_percentile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_percentile.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_percentile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_percentile.q.out Wed Apr 10 00:06:55 2013
@@ -288,7 +288,8 @@ POSTHOOK: Input: default@src
 47	470.0	477.0	479.0	[470.0,477.0,478.94,479.0]
 48	480.0	484.0	489.0	[480.0,484.0,489.0,489.0]
 49	490.0	494.5	498.0	[490.0,494.5,498.0,498.0]
-PREHOOK: query: SELECT CAST(key AS INT) DIV 10,
+PREHOOK: query: -- test null handling
+SELECT CAST(key AS INT) DIV 10,
        percentile(NULL, 0.0),
        percentile(NULL, array(0.0, 0.5, 0.99, 1.0))
 FROM src
@@ -296,7 +297,8 @@ GROUP BY CAST(key AS INT) DIV 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT CAST(key AS INT) DIV 10,
+POSTHOOK: query: -- test null handling
+SELECT CAST(key AS INT) DIV 10,
        percentile(NULL, 0.0),
        percentile(NULL, array(0.0, 0.5, 0.99, 1.0))
 FROM src
@@ -354,7 +356,8 @@ POSTHOOK: Input: default@src
 47	NULL	NULL
 48	NULL	NULL
 49	NULL	NULL
-PREHOOK: query: SELECT CAST(key AS INT) DIV 10,
+PREHOOK: query: -- test empty array handling
+SELECT CAST(key AS INT) DIV 10,
        percentile(IF(CAST(key AS INT) DIV 10 < 5, 1, NULL), 0.5),
        percentile(IF(CAST(key AS INT) DIV 10 < 5, 1, NULL), array(0.0, 0.5, 0.99, 1.0))
 FROM src
@@ -362,7 +365,8 @@ GROUP BY CAST(key AS INT) DIV 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT CAST(key AS INT) DIV 10,
+POSTHOOK: query: -- test empty array handling
+SELECT CAST(key AS INT) DIV 10,
        percentile(IF(CAST(key AS INT) DIV 10 < 5, 1, NULL), 0.5),
        percentile(IF(CAST(key AS INT) DIV 10 < 5, 1, NULL), array(0.0, 0.5, 0.99, 1.0))
 FROM src
@@ -429,11 +433,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 NULL
-PREHOOK: query: select percentile(cast(key as bigint), array()) from src where false
+PREHOOK: query: -- test where percentile list is empty
+select percentile(cast(key as bigint), array()) from src where false
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: select percentile(cast(key as bigint), array()) from src where false
+POSTHOOK: query: -- test where percentile list is empty
+select percentile(cast(key as bigint), array()) from src where false
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_positive.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_positive.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_positive.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_positive.q.out Wed Apr 10 00:06:55 2013
@@ -8,9 +8,11 @@ PREHOOK: type: DESCFUNCTION
 POSTHOOK: query: DESCRIBE FUNCTION EXTENDED positive
 POSTHOOK: type: DESCFUNCTION
 positive a - Returns a
-PREHOOK: query: DESCRIBE FUNCTION +
+PREHOOK: query: -- synonym
+DESCRIBE FUNCTION +
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: DESCRIBE FUNCTION +
+POSTHOOK: query: -- synonym
+DESCRIBE FUNCTION +
 POSTHOOK: type: DESCFUNCTION
 a + b - Returns a+b
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED +