You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/12/07 18:23:00 UTC

svn commit: r1418405 [2/4] - in /hive/trunk: contrib/src/test/results/clientpositive/ hbase-handler/src/test/results/positive/ hwi/src/test/org/apache/hadoop/hive/hwi/ jdbc/src/test/org/apache/hadoop/hive/jdbc/ ql/src/java/org/apache/hadoop/hive/ql/exe...

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out Fri Dec  7 17:22:32 2012
@@ -9,9 +9,11 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
@@ -26,9 +28,11 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table
 POSTHOOK: type: DESCTABLE
-id	int	from deserializer
-query	string	from deserializer
-name	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	from deserializer   
+query               	string              	from deserializer   
+name                	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',')
@@ -43,9 +47,11 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table
 POSTHOOK: type: DESCTABLE
-id	int	from deserializer
-query	string	from deserializer
-name	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	from deserializer   
+query               	string              	from deserializer   
+name                	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table test_table
@@ -74,10 +80,17 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table partition (dt='2011')
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
@@ -92,10 +105,17 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table partition (dt='2011')
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',')
@@ -110,10 +130,17 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table partition (dt='2011')
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- test partitions
@@ -133,10 +160,17 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table partition (dt='2011')
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table test_table partition(dt='2011') set serdeproperties ('field.delim' = ',')
@@ -152,10 +186,17 @@ PREHOOK: query: describe extended test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended test_table partition (dt='2011')
 POSTHOOK: type: DESCTABLE
-id	int	
-query	string	
-name	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+id                  	int                 	None                
+query               	string              	None                
+name                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table test_table

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out Fri Dec  7 17:22:32 2012
@@ -14,9 +14,11 @@ PREHOOK: query: DESCRIBE EXTENDED view1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view1
 POSTHOOK: type: DESCTABLE
-foo	int	
-bar	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+foo                 	int                 	None                
+bar                 	string              	None                
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER VIEW view1 RENAME TO view2
@@ -32,9 +34,11 @@ PREHOOK: query: DESCRIBE EXTENDED view2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view2
 POSTHOOK: type: DESCTABLE
-foo	int	
-bar	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+foo                 	int                 	None                
+bar                 	string              	None                
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SELECT * FROM view2

Modified: hive/trunk/ql/src/test/results/clientpositive/archive_corrupt.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/archive_corrupt.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/archive_corrupt.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/archive_corrupt.q.out Fri Dec  7 17:22:32 2012
@@ -84,10 +84,18 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table tstsrcpart archive partition (ds='2008-04-08', hr='11')
@@ -114,10 +122,18 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table tstsrcpart unarchive partition (ds='2008-04-08', hr='11')

Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out Fri Dec  7 17:22:32 2012
@@ -11,8 +11,10 @@ PREHOOK: query: DESCRIBE src_authorizati
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE src_authorization_7
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: DROP TABLE  src_authorization_7
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@src_authorization_7
@@ -38,8 +40,10 @@ PREHOOK: query: DESCRIBE src_authorizati
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE src_authorization_7
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: DROP TABLE  src_authorization_7
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@src_authorization_7

Modified: hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.q.out Fri Dec  7 17:22:32 2012
@@ -19,16 +19,18 @@ PREHOOK: query: describe dest_grouped_ol
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe dest_grouped_old1
 POSTHOOK: type: DESCTABLE
-_c0	int	
-zz	int	
-key	string	
-_c3	int	
-_c4	bigint	
-_c5	double	
-_c6	bigint	
-_c7	bigint	
-_c8	int	
-_c9	int	
+# col_name            	data_type           	comment             
+	 	 
+_c0                 	int                 	None                
+zz                  	int                 	None                
+key                 	string              	None                
+_c3                 	int                 	None                
+_c4                 	bigint              	None                
+_c5                 	double              	None                
+_c6                 	bigint              	None                
+_c7                 	bigint              	None                
+_c8                 	int                 	None                
+_c9                 	int                 	None                
 PREHOOK: query: create table dest_grouped_old2 as select distinct src.key from src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
@@ -40,7 +42,9 @@ PREHOOK: query: describe dest_grouped_ol
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe dest_grouped_old2
 POSTHOOK: type: DESCTABLE
-key	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
 PREHOOK: query: create table dest_grouped_new1 as select 1+1, 2+2 as zz, ((src.key % 2)+2)/2, test_max(length(src.value)), count(src.value), sin(count(src.value)), count(sin(src.value)), unix_timestamp(), CAST(SUM(IF(value > 10, value, 1)) AS INT), if(src.key > 10,
 	(src.key +5) % 2,
 0)
@@ -58,16 +62,18 @@ PREHOOK: query: describe dest_grouped_ne
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe dest_grouped_new1
 POSTHOOK: type: DESCTABLE
-column_0	int	
-zz	int	
-column_2	double	
-test_max_length_src__3	int	
-count_src_value_4	bigint	
-sin_count_src_value_5	double	
-count_sin_src_value_6	bigint	
-unix_timestamp_7	bigint	
-sum_if_value_10_valu_8	int	
-if_src_key_10_src_ke_9	double	
+# col_name            	data_type           	comment             
+	 	 
+column_0            	int                 	None                
+zz                  	int                 	None                
+column_2            	double              	None                
+test_max_length_src__3	int                 	None                
+count_src_value_4   	bigint              	None                
+sin_count_src_value_5	double              	None                
+count_sin_src_value_6	bigint              	None                
+unix_timestamp_7    	bigint              	None                
+sum_if_value_10_valu_8	int                 	None                
+if_src_key_10_src_ke_9	double              	None                
 PREHOOK: query: create table dest_grouped_new2 as select distinct src.key from src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
@@ -79,7 +85,9 @@ PREHOOK: query: describe dest_grouped_ne
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe dest_grouped_new2
 POSTHOOK: type: DESCTABLE
-key	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
 PREHOOK: query: -- Drop the temporary function at the end till HIVE-3160 gets fixed
 DROP TEMPORARY FUNCTION test_max
 PREHOOK: type: DROPFUNCTION

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_change_schema.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_change_schema.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_change_schema.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_change_schema.q.out Fri Dec  7 17:22:32 2012
@@ -33,8 +33,10 @@ PREHOOK: query: DESCRIBE avro2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE avro2
 POSTHOOK: type: DESCTABLE
-string1	string	from deserializer
-string2	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+string1             	string              	from deserializer   
+string2             	string              	from deserializer   
 PREHOOK: query: ALTER TABLE avro2 SET TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive",
   "name": "second_schema",
   "type": "record",
@@ -61,6 +63,8 @@ PREHOOK: query: DESCRIBE avro2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE avro2
 POSTHOOK: type: DESCTABLE
-int1	int	from deserializer
-float1	float	from deserializer
-double1	double	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+int1                	int                 	from deserializer   
+float1              	float               	from deserializer   
+double1             	double              	from deserializer   

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out Fri Dec  7 17:22:32 2012
@@ -75,10 +75,12 @@ PREHOOK: query: DESCRIBE doctors_with_ne
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE doctors_with_new_field
 POSTHOOK: type: DESCTABLE
-number	int	from deserializer
-first_name	string	from deserializer
-last_name	string	from deserializer
-extra_field	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+number              	int                 	from deserializer   
+first_name          	string              	from deserializer   
+last_name           	string              	from deserializer   
+extra_field         	string              	from deserializer   
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors_with_new_field
 PREHOOK: type: LOAD
 PREHOOK: Output: default@doctors_with_new_field

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out Fri Dec  7 17:22:32 2012
@@ -77,10 +77,12 @@ PREHOOK: query: DESCRIBE doctors4
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE doctors4
 POSTHOOK: type: DESCTABLE
-number	int	from deserializer
-first_name	string	from deserializer
-last_name	string	from deserializer
-extra_field	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+number              	int                 	from deserializer   
+first_name          	string              	from deserializer   
+last_name           	string              	from deserializer   
+extra_field         	string              	from deserializer   
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors4
 PREHOOK: type: LOAD
 PREHOOK: Output: default@doctors4
@@ -150,9 +152,11 @@ PREHOOK: query: DESCRIBE episodes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE episodes
 POSTHOOK: type: DESCTABLE
-title	string	from deserializer
-air_date	string	from deserializer
-doctor	int	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+title               	string              	from deserializer   
+air_date            	string              	from deserializer   
+doctor              	int                 	from deserializer   
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/episodes.avro' INTO TABLE episodes
 PREHOOK: type: LOAD
 PREHOOK: Output: default@episodes

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out Fri Dec  7 17:22:32 2012
@@ -63,9 +63,11 @@ PREHOOK: query: DESCRIBE doctors
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE doctors
 POSTHOOK: type: DESCTABLE
-number	int	from deserializer
-first_name	string	from deserializer
-last_name	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+number              	int                 	from deserializer   
+first_name          	string              	from deserializer   
+last_name           	string              	from deserializer   
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors
 PREHOOK: type: LOAD
 PREHOOK: Output: default@doctors

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_schema_error_message.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_schema_error_message.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_schema_error_message.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_schema_error_message.q.out Fri Dec  7 17:22:32 2012
@@ -21,10 +21,12 @@ PREHOOK: query: DESCRIBE avro_with_no_sc
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE avro_with_no_schema
 POSTHOOK: type: DESCTABLE
-error_error_error_error_error_error_error	string	from deserializer
-cannot_determine_schema	string	from deserializer
-check	string	from deserializer
-schema	string	from deserializer
-url	string	from deserializer
-and	string	from deserializer
-literal	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+error_error_error_error_error_error_error	string              	from deserializer   
+cannot_determine_schema	string              	from deserializer   
+check               	string              	from deserializer   
+schema              	string              	from deserializer   
+url                 	string              	from deserializer   
+and                 	string              	from deserializer   
+literal             	string              	from deserializer   

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_schema_literal.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_schema_literal.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_schema_literal.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_schema_literal.q.out Fri Dec  7 17:22:32 2012
@@ -63,19 +63,21 @@ PREHOOK: query: DESCRIBE avro1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE avro1
 POSTHOOK: type: DESCTABLE
-string1	string	from deserializer
-int1	int	from deserializer
-tinyint1	int	from deserializer
-smallint1	int	from deserializer
-bigint1	bigint	from deserializer
-boolean1	boolean	from deserializer
-float1	float	from deserializer
-double1	double	from deserializer
-list1	array<string>	from deserializer
-map1	map<string,int>	from deserializer
-struct1	struct<sint:int,sboolean:boolean,sstring:string>	from deserializer
-union1	uniontype<float,boolean,string>	from deserializer
-enum1	string	from deserializer
-nullableint	int	from deserializer
-bytes1	array<tinyint>	from deserializer
-fixed1	array<tinyint>	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+string1             	string              	from deserializer   
+int1                	int                 	from deserializer   
+tinyint1            	int                 	from deserializer   
+smallint1           	int                 	from deserializer   
+bigint1             	bigint              	from deserializer   
+boolean1            	boolean             	from deserializer   
+float1              	float               	from deserializer   
+double1             	double              	from deserializer   
+list1               	array<string>       	from deserializer   
+map1                	map<string,int>     	from deserializer   
+struct1             	struct<sint:int,sboolean:boolean,sstring:string>	from deserializer   
+union1              	uniontype<float,boolean,string>	from deserializer   
+enum1               	string              	from deserializer   
+nullableint         	int                 	from deserializer   
+bytes1              	array<tinyint>      	from deserializer   
+fixed1              	array<tinyint>      	from deserializer   

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out Fri Dec  7 17:22:32 2012
@@ -15,8 +15,10 @@ PREHOOK: query: describe extended ba_tes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key	binary	
-ba_val	binary	
+# col_name            	data_type           	comment             
+	 	 
+ba_key              	binary              	None                
+ba_val              	binary              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out Fri Dec  7 17:22:32 2012
@@ -23,8 +23,10 @@ PREHOOK: query: describe extended ba_tes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key	binary	from deserializer
-ba_val	binary	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+ba_key              	binary              	from deserializer   
+ba_val              	binary              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table_union.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table_union.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table_union.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table_union.q.out Fri Dec  7 17:22:32 2012
@@ -13,8 +13,10 @@ PREHOOK: query: describe extended ba_tes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key	binary	
-ba_val	binary	
+# col_name            	data_type           	comment             
+	 	 
+ba_key              	binary              	None                
+ba_val              	binary              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out Fri Dec  7 17:22:32 2012
@@ -23,8 +23,10 @@ PREHOOK: query: describe extended ba_tes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key	binary	from deserializer
-ba_val	binary	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+ba_key              	binary              	from deserializer   
+ba_val              	binary              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out Fri Dec  7 17:22:32 2012
@@ -15,8 +15,10 @@ PREHOOK: query: describe extended ba_tes
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key	binary	
-ba_val	binary	
+# col_name            	data_type           	comment             
+	 	 
+ba_key              	binary              	None                
+ba_val              	binary              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out Fri Dec  7 17:22:32 2012
@@ -7,9 +7,16 @@ PREHOOK: query: describe extended cluste
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended clustergroupby
 POSTHOOK: type: DESCTABLE
-key	string	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table clustergroupby clustered by (key) into 1 buckets
@@ -134,9 +141,16 @@ POSTHOOK: query: describe extended clust
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table clustergroupby partition (ds='101') select key, value from src distribute by key
@@ -1202,9 +1216,16 @@ POSTHOOK: Lineage: clustergroupby PARTIT
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table clustergroupby partition (ds='102') select key, value from src distribute by value sort by key, value
@@ -1600,9 +1621,16 @@ POSTHOOK: Lineage: clustergroupby PARTIT
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table clustergroupby partition (ds='103') select key, value from src distribute by value, key sort by key

Modified: hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out Fri Dec  7 17:22:32 2012
@@ -182,8 +182,10 @@ POSTHOOK: Lineage: columnarserde_create_
 POSTHOOK: Lineage: columnarserde_create_shortcut.e SIMPLE [(src_thrift)src_thrift.FieldSchema(name:astring, type:string, comment:from deserializer), ]
 POSTHOOK: Lineage: columnshortcuttable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: columnshortcuttable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
 PREHOOK: query: SELECT columnShortcutTable.* FROM columnShortcutTable ORDER BY key ASC, value ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@columnshortcuttable

Modified: hive/trunk/ql/src/test/results/clientpositive/combine3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/combine3.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/combine3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/combine3.q.out Fri Dec  7 17:22:32 2012
@@ -47,10 +47,18 @@ POSTHOOK: Lineage: combine_3_srcpart_seq
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	int	
-value	string	
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: desc extended combine_3_srcpart_seq_rc partition(ds="2010-08-03", hr="001")
@@ -61,10 +69,18 @@ POSTHOOK: Lineage: combine_3_srcpart_seq
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	int	
-value	string	
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: select key, value, ds, hr from combine_3_srcpart_seq_rc where ds="2010-08-03" order by key, hr limit 30

Modified: hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out Fri Dec  7 17:22:32 2012
@@ -21,25 +21,32 @@ PREHOOK: query: describe convert_enum_to
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe convert_enum_to_string
 POSTHOOK: type: DESCTABLE
-my_bool	boolean	from deserializer
-my_byte	tinyint	from deserializer
-my_16bit_int	smallint	from deserializer
-my_32bit_int	int	from deserializer
-my_64bit_int	bigint	from deserializer
-my_double	double	from deserializer
-my_string	string	from deserializer
-my_binary	struct<hb:binary,offset:int,isreadonly:boolean,bigendian:boolean,nativebyteorder:boolean>	from deserializer
-my_string_string_map	map<string,string>	from deserializer
-my_string_enum_map	map<string,string>	from deserializer
-my_enum_string_map	map<string,string>	from deserializer
-my_enum_struct_map	map<string,struct<my_string:string,my_enum:string,optionals:struct<>>>	from deserializer
-my_enum_stringlist_map	map<string,array<string>>	from deserializer
-my_enum_structlist_map	map<string,array<struct<my_string:string,my_enum:string,optionals:struct<>>>>	from deserializer
-my_stringlist	array<string>	from deserializer
-my_structlist	array<struct<my_string:string,my_enum:string,optionals:struct<>>>	from deserializer
-my_enumlist	array<string>	from deserializer
-my_stringset	struct<>	from deserializer
-my_enumset	struct<>	from deserializer
-my_structset	struct<>	from deserializer
-optionals	struct<>	from deserializer
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+my_bool             	boolean             	from deserializer   
+my_byte             	tinyint             	from deserializer   
+my_16bit_int        	smallint            	from deserializer   
+my_32bit_int        	int                 	from deserializer   
+my_64bit_int        	bigint              	from deserializer   
+my_double           	double              	from deserializer   
+my_string           	string              	from deserializer   
+my_binary           	struct<hb:binary,offset:int,isreadonly:boolean,bigendian:boolean,nativebyteorder:boolean>	from deserializer   
+my_string_string_map	map<string,string>  	from deserializer   
+my_string_enum_map  	map<string,string>  	from deserializer   
+my_enum_string_map  	map<string,string>  	from deserializer   
+my_enum_struct_map  	map<string,struct<my_string:string,my_enum:string,optionals:struct<>>>	from deserializer   
+my_enum_stringlist_map	map<string,array<string>>	from deserializer   
+my_enum_structlist_map	map<string,array<struct<my_string:string,my_enum:string,optionals:struct<>>>>	from deserializer   
+my_stringlist       	array<string>       	from deserializer   
+my_structlist       	array<struct<my_string:string,my_enum:string,optionals:struct<>>>	from deserializer   
+my_enumlist         	array<string>       	from deserializer   
+my_stringset        	struct<>            	from deserializer   
+my_enumset          	struct<>            	from deserializer   
+my_structset        	struct<>            	from deserializer   
+optionals           	struct<>            	from deserializer   
+b                   	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+b                   	string              	None                

Modified: hive/trunk/ql/src/test/results/clientpositive/create_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_1.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_1.q.out Fri Dec  7 17:22:32 2012
@@ -7,14 +7,18 @@ PREHOOK: query: DESCRIBE table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE IF NOT EXISTS table1 (a STRING, b STRING) STORED AS TEXTFILE
@@ -30,14 +34,18 @@ PREHOOK: query: DESCRIBE table2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table2
 POSTHOOK: type: DESCTABLE
-a	string	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	int                 	None                
 PREHOOK: query: DESCRIBE EXTENDED table2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table2
 POSTHOOK: type: DESCTABLE
-a	string	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE table3 (a STRING, b STRING)
@@ -53,14 +61,18 @@ PREHOOK: query: DESCRIBE table3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table3
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED table3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table3
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE table4 (a STRING, b STRING)
@@ -76,14 +88,18 @@ PREHOOK: query: DESCRIBE table4
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table4
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED table4
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table4
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE table5 (a STRING, b STRING)
@@ -99,13 +115,17 @@ PREHOOK: query: DESCRIBE table5
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table5
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED table5
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table5
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 	 	 
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/create_default_prop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_default_prop.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_default_prop.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_default_prop.q.out Fri Dec  7 17:22:32 2012
@@ -7,7 +7,9 @@ PREHOOK: query: DESC EXTENDED table_p1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESC EXTENDED table_p1
 POSTHOOK: type: DESCTABLE
-a	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE table_p2 LIKE table_p1
@@ -19,7 +21,9 @@ PREHOOK: query: DESC EXTENDED table_p2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESC EXTENDED table_p2
 POSTHOOK: type: DESCTABLE
-a	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: CREATE TABLE table_p3 AS SELECT * FROM table_p1
@@ -33,6 +37,8 @@ PREHOOK: query: DESC EXTENDED table_p3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESC EXTENDED table_p3
 POSTHOOK: type: DESCTABLE
-a	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
 	 	 
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/create_escape.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_escape.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_escape.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_escape.q.out Fri Dec  7 17:22:32 2012
@@ -11,14 +11,18 @@ PREHOOK: query: DESCRIBE table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key, '\\\t\\' FROM src WHERE key = 86

Modified: hive/trunk/ql/src/test/results/clientpositive/create_insert_outputformat.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_insert_outputformat.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_insert_outputformat.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_insert_outputformat.q.out Fri Dec  7 17:22:32 2012
@@ -25,8 +25,10 @@ POSTHOOK: query: describe table_test_out
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat'
@@ -60,8 +62,10 @@ POSTHOOK: Lineage: table_test_output_for
 POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat'
   OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat'
@@ -101,5 +105,7 @@ POSTHOOK: Lineage: table_test_output_for
 POSTHOOK: Lineage: table_test_output_format_hivesequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                

Modified: hive/trunk/ql/src/test/results/clientpositive/create_like_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_like_view.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_like_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_like_view.q.out Fri Dec  7 17:22:32 2012
@@ -23,8 +23,10 @@ PREHOOK: query: DESCRIBE table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE FORMATTED table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE FORMATTED table1
@@ -70,8 +72,10 @@ PREHOOK: query: DESCRIBE table2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table2
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE FORMATTED table2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE FORMATTED table2
@@ -118,8 +122,10 @@ PREHOOK: query: DESCRIBE table3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table3
 POSTHOOK: type: DESCTABLE
-a	string	
-b	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	string              	None                
 PREHOOK: query: DESCRIBE FORMATTED table3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE FORMATTED table3

Modified: hive/trunk/ql/src/test/results/clientpositive/create_nested_type.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_nested_type.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_nested_type.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_nested_type.q.out Fri Dec  7 17:22:32 2012
@@ -17,18 +17,22 @@ PREHOOK: query: DESCRIBE table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	array<string>	
-c	array<map<string,string>>	
-d	map<string,array<string>>	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	array<string>       	None                
+c                   	array<map<string,string>>	None                
+d                   	map<string,array<string>>	None                
 PREHOOK: query: DESCRIBE EXTENDED table1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED table1
 POSTHOOK: type: DESCTABLE
-a	string	
-b	array<string>	
-c	array<map<string,string>>	
-d	map<string,array<string>>	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	array<string>       	None                
+c                   	array<map<string,string>>	None                
+d                   	map<string,array<string>>	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table1

Modified: hive/trunk/ql/src/test/results/clientpositive/create_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_view.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_view.q.out Fri Dec  7 17:22:32 2012
@@ -231,12 +231,16 @@ PREHOOK: query: DESCRIBE view1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view1
 POSTHOOK: type: DESCTABLE
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED view1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view1
 POSTHOOK: type: DESCTABLE
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view1
@@ -272,14 +276,18 @@ PREHOOK: query: DESCRIBE view2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view2
 POSTHOOK: type: DESCTABLE
-key	string	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED view2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view2
 POSTHOOK: type: DESCTABLE
-key	string	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view2
@@ -316,12 +324,16 @@ PREHOOK: query: DESCRIBE view3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view3
 POSTHOOK: type: DESCTABLE
-valoo	string	
+# col_name            	data_type           	comment             
+	 	 
+valoo               	string              	None                
 PREHOOK: query: DESCRIBE EXTENDED view3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view3
 POSTHOOK: type: DESCTABLE
-valoo	string	
+# col_name            	data_type           	comment             
+	 	 
+valoo               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view3
@@ -366,7 +378,9 @@ PREHOOK: query: DESCRIBE EXTENDED view3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view3
 POSTHOOK: type: DESCTABLE
-valoo	string	
+# col_name            	data_type           	comment             
+	 	 
+valoo               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view3
@@ -413,15 +427,19 @@ POSTHOOK: query: -- use DESCRIBE EXTENDE
 -- of comparison for view descriptions
 DESCRIBE EXTENDED table1
 POSTHOOK: type: DESCTABLE
-key	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE EXTENDED src1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED src1
 POSTHOOK: type: DESCTABLE
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- use DESCRIBE EXTENDED on a base table as a point of comparison for
@@ -432,7 +450,9 @@ POSTHOOK: query: -- use DESCRIBE EXTENDE
 -- view descriptions
 DESCRIBE EXTENDED table1
 POSTHOOK: type: DESCTABLE
-key	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key FROM src WHERE key = 86
@@ -479,7 +499,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view4
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
 PREHOOK: query: ALTER TABLE table1 ADD COLUMNS (value STRING)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@table1
@@ -516,14 +538,18 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: DESCRIBE view4
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view4
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
 PREHOOK: query: CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2
 FROM view4 v1 join view4 v2
 PREHOOK: type: CREATEVIEW
@@ -555,8 +581,10 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view5
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key1	int	
-key2	int	
+# col_name            	data_type           	comment             
+	 	 
+key1                	int                 	None                
+key2                	int                 	None                
 PREHOOK: query: -- verify that column name and comment in DDL portion
 -- overrides column alias in SELECT
 CREATE VIEW view6(valoo COMMENT 'I cannot spell') AS
@@ -576,7 +604,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view6
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-valoo	string	I cannot spell
+# col_name            	data_type           	comment             
+	 	 
+valoo               	string              	I cannot spell      
 PREHOOK: query: -- verify that ORDER BY and LIMIT are both supported in view def
 CREATE VIEW view7 AS
 SELECT * FROM src
@@ -710,7 +740,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view8
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-c	string	
+# col_name            	data_type           	comment             
+	 	 
+c                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 FROM table1, viewExpandedText:SELECT `_c0` AS `c` FROM (SELECT `test_translate`('abc', 'a', 'b')	 	 
@@ -787,7 +819,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view9
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-m	int	
+# col_name            	data_type           	comment             
+	 	 
+m                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))	 	 
@@ -864,7 +898,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view9
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-m	int	
+# col_name            	data_type           	comment             
+	 	 
+m                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))	 	 
@@ -930,8 +966,10 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view10
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	string	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view10
@@ -1003,7 +1041,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view11
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-boom	int	
+# col_name            	data_type           	comment             
+	 	 
+boom                	int                 	None                
 	 	 
 #### A masked pattern was here ####
 FROM table1, viewExpandedText:SELECT `test_explode`(array(1,2,3)) AS (`boom`)	 	 
@@ -1071,9 +1111,11 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view12
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	string	
-value	string	
-mycol	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+mycol               	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE FORMATTED view12
@@ -1157,7 +1199,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view13
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	int	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
 	 	 
 #### A masked pattern was here ####
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s, viewExpandedText:SELECT `s`.`key`	 	 
@@ -1254,10 +1298,12 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view14
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-k1	string	
-v1	string	
-k2	string	
-v2	string	
+# col_name            	data_type           	comment             
+	 	 
+k1                  	string              	None                
+v1                  	string              	None                
+k2                  	string              	None                
+v2                  	string              	None                
 	 	 
 #### A masked pattern was here ####
        unionsrc2.key as k2, unionsrc2.value as v2	 	 
@@ -1386,8 +1432,10 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view15
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	string	
-value_count	bigint	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value_count         	bigint              	None                
 	 	 
 #### A masked pattern was here ####
 FROM src	 	 
@@ -1473,7 +1521,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED view16
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 FROM src, viewExpandedText:SELECT DISTINCT `src`.`value`	 	 
@@ -1551,7 +1601,9 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE view16
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 PREHOOK: query: -- Likewise, DROP VIEW IF EXISTS should ignore a matching table name
 DROP VIEW IF EXISTS table1
 PREHOOK: type: DROPVIEW
@@ -1568,8 +1620,10 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE table1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 PREHOOK: query: -- this should work since currently we don't track view->table
 -- dependencies for implementing RESTRICT
 

Modified: hive/trunk/ql/src/test/results/clientpositive/create_view_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_view_partitioned.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_view_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_view_partitioned.q.out Fri Dec  7 17:22:32 2012
@@ -35,8 +35,15 @@ PREHOOK: query: DESCRIBE EXTENDED vp1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED vp1
 POSTHOOK: type: DESCTABLE
-key	string	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	None                
+value               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 FROM src	 	 

Modified: hive/trunk/ql/src/test/results/clientpositive/database.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/database.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/database.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/database.q.out Fri Dec  7 17:22:32 2012
@@ -129,14 +129,18 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: -- DESCRIBE table in non-default DB
 DESCRIBE test_table
 POSTHOOK: type: DESCTABLE
-col1	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
 PREHOOK: query: -- DESCRIBE EXTENDED in non-default DB
 DESCRIBE EXTENDED test_table
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: -- DESCRIBE EXTENDED in non-default DB
 DESCRIBE EXTENDED test_table
 POSTHOOK: type: DESCTABLE
-col1	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- CREATE LIKE in non-default DB
@@ -156,7 +160,9 @@ PREHOOK: query: DESCRIBE EXTENDED test_t
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED test_table_like
 POSTHOOK: type: DESCTABLE
-col1	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- LOAD and SELECT
@@ -1336,8 +1342,10 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: bucketized_src.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: bucketized_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ]
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- character escaping

Modified: hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out Fri Dec  7 17:22:32 2012
@@ -7,8 +7,10 @@ PREHOOK: query: desc extended T1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended T1
 POSTHOOK: type: DESCTABLE
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T1 select * from src
@@ -27,8 +29,10 @@ POSTHOOK: query: desc extended T1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T1 select /*+ HOLD_DDLTIME*/ * from src
@@ -51,8 +55,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)s
 POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T1 select * from src
@@ -79,8 +85,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)s
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: create table if not exists T2 like srcpart
@@ -104,10 +112,18 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)s
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T2 partition (ds = '2010-06-21', hr = '1') select key, value from src where key > 10
@@ -138,10 +154,18 @@ POSTHOOK: Lineage: t1.value SIMPLE [(src
 POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T2 partition (ds = '2010-06-21', hr='1') select /*+ HOLD_DDLTIME */ key, value from src where key > 10
@@ -176,10 +200,18 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table T2 partition (ds='2010-06-01', hr='1') select key, value from src where key > 10
@@ -218,9 +250,17 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 	 	 
 #### A masked pattern was here ####

Added: hive/trunk/ql/src/test/results/clientpositive/describe_comment_indent.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/describe_comment_indent.q.out?rev=1418405&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/describe_comment_indent.q.out (added)
+++ hive/trunk/ql/src/test/results/clientpositive/describe_comment_indent.q.out Fri Dec  7 17:22:32 2012
@@ -0,0 +1,71 @@
+PREHOOK: query: -- test comment indent processing for multi-line comments
+
+CREATE TABLE test_table(
+    col1 INT COMMENT 'col1 one line comment',
+    col2 STRING COMMENT 'col2
+two lines comment',
+    col3 STRING COMMENT 'col3
+three lines
+comment') 
+COMMENT 'table comment
+two lines'
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- test comment indent processing for multi-line comments
+
+CREATE TABLE test_table(
+    col1 INT COMMENT 'col1 one line comment',
+    col2 STRING COMMENT 'col2
+two lines comment',
+    col3 STRING COMMENT 'col3
+three lines
+comment') 
+COMMENT 'table comment
+two lines'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@test_table
+PREHOOK: query: DESCRIBE test_table
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE test_table
+POSTHOOK: type: DESCTABLE
+# col_name            	data_type           	comment             
+	 	 
+col1                	int                 	col1 one line comment
+col2                	string              	col2                
+                    	                    	two lines comment
+col3                	string              	col3                
+                    	                    	three lines
+                    	                    	comment
+PREHOOK: query: DESCRIBE FORMATTED test_table
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE FORMATTED test_table
+POSTHOOK: type: DESCTABLE
+# col_name            	data_type           	comment             
+	 	 
+col1                	int                 	col1 one line comment
+col2                	string              	col2                
+                    	                    	two lines comment
+col3                	string              	col3                
+                    	                    	three lines
+                    	                    	comment
+	 	 
+# Detailed Table Information	 	 
+Database:           	default             	 
+#### A masked pattern was here ####
+Protect Mode:       	None                	 
+Retention:          	0                   	 
+#### A masked pattern was here ####
+Table Type:         	MANAGED_TABLE       	 
+Table Parameters:	 	 
+	comment             	table comment\ntwo lines
+#### A masked pattern was here ####
+	 	 
+# Storage Information	 	 
+SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe	 
+InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
+OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
+Compressed:         	No                  	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
+Storage Desc Params:	 	 
+	serialization.format	1