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

svn commit: r1468783 [11/16] - in /hive/branches/HIVE-4115: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/ beeline/src/test/org/apache/ beeline/src/test/org/apache/hive/ beeline/src/test/org/apache/hive/beeline/ beeline/src/test/org...

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out Wed Apr 17 07:29:38 2013
@@ -57,8 +57,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department identifier
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_all_part.q.out Wed Apr 17 07:29:38 2013
@@ -91,8 +91,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out Wed Apr 17 07:29:38 2013
@@ -101,8 +101,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	from deserializer   
 emp_name            	string              	from deserializer   
 emp_dob             	string              	from deserializer   
@@ -122,8 +120,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='tn')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_name            	string              	None                
 emp_dob             	string              	employee date of birth
@@ -143,8 +139,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='ka')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	from deserializer   
 emp_name            	string              	from deserializer   
 emp_dob             	string              	from deserializer   

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_05_some_part.q.out Wed Apr 17 07:29:38 2013
@@ -85,8 +85,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_06_one_part.q.out Wed Apr 17 07:29:38 2013
@@ -82,8 +82,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out Wed Apr 17 07:29:38 2013
@@ -114,8 +114,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	iso code            
 emp_state           	string              	free-form text      

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out Wed Apr 17 07:29:38 2013
@@ -65,8 +65,6 @@ PREHOOK: query: describe extended exim_i
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_imported_dept
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out Wed Apr 17 07:29:38 2013
@@ -120,8 +120,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_10_external_managed.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_10_external_managed.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_10_external_managed.q.out Wed Apr 17 07:29:38 2013
@@ -51,8 +51,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_11_managed_external.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_11_managed_external.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_11_managed_external.q.out Wed Apr 17 07:29:38 2013
@@ -47,8 +47,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_12_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_12_external_location.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_12_external_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_12_external_location.q.out Wed Apr 17 07:29:38 2013
@@ -50,8 +50,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_13_managed_location.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_13_managed_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_13_managed_location.q.out Wed Apr 17 07:29:38 2013
@@ -50,8 +50,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out Wed Apr 17 07:29:38 2013
@@ -62,8 +62,6 @@ PREHOOK: query: describe extended exim_d
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_department
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 dep_id              	int                 	department id       
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_15_external_part.q.out Wed Apr 17 07:29:38 2013
@@ -125,8 +125,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_18_part_external.q.out Wed Apr 17 07:29:38 2013
@@ -90,8 +90,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out Wed Apr 17 07:29:38 2013
@@ -72,8 +72,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out Wed Apr 17 07:29:38 2013
@@ -93,8 +93,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out Wed Apr 17 07:29:38 2013
@@ -93,8 +93,6 @@ PREHOOK: query: describe extended exim_e
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended exim_employee
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 emp_id              	int                 	employee id         
 emp_country         	string              	two char iso code   
 emp_state           	string              	free text           

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/explain_dependency.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/explain_dependency.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/explain_dependency.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/explain_dependency.q.out Wed Apr 17 07:29:38 2013
@@ -3,41 +3,34 @@ PREHOOK: query: -- This test is used for
 -- Create some views
 CREATE VIEW V1 AS SELECT key, value from src
 PREHOOK: type: CREATEVIEW
-#### A masked pattern was here ####
 POSTHOOK: query: -- This test is used for testing EXPLAIN DEPENDENCY command
 
 -- Create some views
 CREATE VIEW V1 AS SELECT key, value from src
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@V1
-#### A masked pattern was here ####
 PREHOOK: query: CREATE VIEW V2 AS SELECT ds, key, value FROM srcpart WHERE ds IS NOT NULL
 PREHOOK: type: CREATEVIEW
-#### A masked pattern was here ####
 POSTHOOK: query: CREATE VIEW V2 AS SELECT ds, key, value FROM srcpart WHERE ds IS NOT NULL
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@V2
-#### A masked pattern was here ####
 PREHOOK: query: CREATE VIEW V3 AS 
   SELECT src1.key, src2.value FROM V2 src1 
   JOIN src src2 ON src1.key = src2.key WHERE src1.ds IS NOT NULL
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@v2
-#### A masked pattern was here ####
 POSTHOOK: query: CREATE VIEW V3 AS 
   SELECT src1.key, src2.value FROM V2 src1 
   JOIN src src2 ON src1.key = src2.key WHERE src1.ds IS NOT NULL
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@v2
 POSTHOOK: Output: default@V3
-#### A masked pattern was here ####
 PREHOOK: query: CREATE VIEW V4 AS 
   SELECT src1.key, src2.value as value1, src3.value as value2 
   FROM V1 src1 JOIN V2 src2 on src1.key = src2.key JOIN src src3 ON src2.key = src3.key
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@v1
 PREHOOK: Input: default@v2
-#### A masked pattern was here ####
 POSTHOOK: query: CREATE VIEW V4 AS 
   SELECT src1.key, src2.value as value1, src3.value as value2 
   FROM V1 src1 JOIN V2 src2 on src1.key = src2.key JOIN src src3 ON src2.key = src3.key
@@ -45,7 +38,6 @@ POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@v1
 POSTHOOK: Input: default@v2
 POSTHOOK: Output: default@V4
-#### A masked pattern was here ####
 PREHOOK: query: -- Simple select queries, union queries and join queries
 EXPLAIN DEPENDENCY 
   SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
@@ -106,13 +98,11 @@ PREHOOK: query: -- The table should show
 -- of the partitions are selected.
 CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10'
 PREHOOK: type: CREATEVIEW
-#### A masked pattern was here ####
 POSTHOOK: query: -- The table should show up in the explain dependency even if none
 -- of the partitions are selected.
 CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10'
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@V5
-#### A masked pattern was here ####
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out Wed Apr 17 07:29:38 2013
@@ -40,8 +40,6 @@ PREHOOK: query: DESCRIBE EXTENDED dest1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED dest1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                
 	 	 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_text.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_text.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_text.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/fileformat_text.q.out Wed Apr 17 07:29:38 2013
@@ -40,8 +40,6 @@ PREHOOK: query: DESCRIBE EXTENDED dest1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED dest1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                
 	 	 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2.q.out Wed Apr 17 07:29:38 2013
@@ -16,9 +16,8 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
+  Stage-0 depends on stages: Stage-1
+  Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
   Stage: Stage-1
@@ -56,43 +55,7 @@ STAGE PLANS:
           keys:
                 expr: KEY._col0
                 type: string
-          mode: partial1
-          outputColumnNames: _col0, _col1, _col2
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col1
-                    type: bigint
-                    expr: _col2
-                    type: double
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-                expr: sum(VALUE._col1)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
-          mode: final
+          mode: complete
           outputColumnNames: _col0, _col1, _col2
           Select Operator
             expressions:
@@ -122,7 +85,7 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest_g2
 
-  Stage: Stage-3
+  Stage: Stage-2
     Stats-Aggr Operator
 
 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2_map_skew.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2_map_skew.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2_map_skew.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby2_map_skew.q.out Wed Apr 17 07:29:38 2013
@@ -16,9 +16,8 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
+  Stage-0 depends on stages: Stage-1
+  Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
   Stage: Stage-1
@@ -73,43 +72,7 @@ STAGE PLANS:
           keys:
                 expr: KEY._col0
                 type: string
-          mode: partials
-          outputColumnNames: _col0, _col1, _col2
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col1
-                    type: bigint
-                    expr: _col2
-                    type: double
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-                expr: sum(VALUE._col1)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
-          mode: final
+          mode: complete
           outputColumnNames: _col0, _col1, _col2
           Select Operator
             expressions:
@@ -139,7 +102,7 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest1
 
-  Stage: Stage-3
+  Stage: Stage-2
     Stats-Aggr Operator
 
 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_cube1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_cube1.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_cube1.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_cube1.q.out Wed Apr 17 07:29:38 2013
@@ -411,7 +411,6 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -471,44 +470,7 @@ STAGE PLANS:
                 type: string
                 expr: KEY._col1
                 type: string
-          mode: partials
-          outputColumnNames: _col0, _col1, _col2
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-              sort order: ++
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col2
-                    type: bigint
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
-                expr: KEY._col1
-                type: string
-          mode: final
+          mode: complete
           outputColumnNames: _col0, _col1, _col2
           Select Operator
             expressions:

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out Wed Apr 17 07:29:38 2013
@@ -1,17 +1,21 @@
-PREHOOK: query: -- This test covers HIVE-2322
+PREHOOK: query: -- This test covers HIVE-2332
 
 create table t1 (int1 int, int2 int, str1 string, str2 string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This test covers HIVE-2322
+POSTHOOK: query: -- This test covers HIVE-2332
 
 create table t1 (int1 int, int2 int, str1 string, str2 string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@t1
-PREHOOK: query: insert into table t1 select cast(key as int), cast(key as int), value, value from src where key < 6
+PREHOOK: query: --disabled RS-dedup for keeping intention of test
+
+insert into table t1 select cast(key as int), cast(key as int), value, value from src where key < 6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@t1
-POSTHOOK: query: insert into table t1 select cast(key as int), cast(key as int), value, value from src where key < 6
+POSTHOOK: query: --disabled RS-dedup for keeping intention of test
+
+insert into table t1 select cast(key as int), cast(key as int), value, value from src where key < 6
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@t1

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_rollup1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_rollup1.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_rollup1.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_rollup1.q.out Wed Apr 17 07:29:38 2013
@@ -399,7 +399,6 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -459,44 +458,7 @@ STAGE PLANS:
                 type: string
                 expr: KEY._col1
                 type: string
-          mode: partials
-          outputColumnNames: _col0, _col1, _col2
-          File Output Operator
-            compressed: false
-            GlobalTableId: 0
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: string
-              sort order: ++
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col2
-                    type: bigint
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations:
-                expr: count(VALUE._col0)
-          bucketGroup: false
-          keys:
-                expr: KEY._col0
-                type: string
-                expr: KEY._col1
-                type: string
-          mode: final
+          mode: complete
           outputColumnNames: _col0, _col1, _col2
           Select Operator
             expressions:

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler0.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler0.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler0.q.out Wed Apr 17 07:29:38 2013
@@ -2,11 +2,64 @@ PREHOOK: query: select count(1) from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
+GBY_2 ==> RS_3: 1
 TS_0 ==> SEL_1: 500
-main() ==> RS_3: 1
 SEL_1 ==> GBY_2: 500
-main() ==> SEL_5: 1
+GBY_4 ==> SEL_5: 1
 main() ==> GBY_4: 1
 main() ==> TS_0: 500
 SEL_5 ==> FS_6: 1
 500
+PREHOOK: query: explain select count(1) from src
+PREHOOK: 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 count 1)))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        src 
+          TableScan
+            alias: src
+            Select Operator
+              Group By Operator
+                aggregations:
+                      expr: count(1)
+                bucketGroup: false
+                mode: hash
+                outputColumnNames: _col0
+                Reduce Output Operator
+                  sort order: 
+                  tag: -1
+                  value expressions:
+                        expr: _col0
+                        type: bigint
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations:
+                expr: count(VALUE._col0)
+          bucketGroup: false
+          mode: mergepartial
+          outputColumnNames: _col0
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: bigint
+            outputColumnNames: _col0
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/index_creation.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/index_creation.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/index_creation.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/index_creation.q.out Wed Apr 17 07:29:38 2013
@@ -43,8 +43,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_2__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -59,8 +57,6 @@ PREHOOK: query: desc extended src_idx_sr
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_idx_src_index_3
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -75,8 +71,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_4__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -91,8 +85,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_5__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -107,8 +99,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_6__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -123,8 +113,6 @@ PREHOOK: query: desc extended src_idx_sr
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_idx_src_index_7
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -139,8 +127,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_8__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    
@@ -155,8 +141,6 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_9__
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	default             
 _bucketname         	string              	                    
 _offsets            	array<bigint>       	                    

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/infer_bucket_sort.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/infer_bucket_sort.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/infer_bucket_sort.q.out Wed Apr 17 07:29:38 2013
@@ -2032,11 +2032,11 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2080,11 +2080,11 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2122,7 +2122,7 @@ OutputFormat:       	org.apache.hadoop.h
 Compressed:         	No                  	 
 Num Buckets:        	1                   	 
 Bucket Columns:     	[key]               	 
-Sort Columns:       	[]                  	 
+Sort Columns:       	[Order(col:key, order:1)]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Test group by in subquery followed by sort by, should only be sorted by the sort key
@@ -2143,8 +2143,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
@@ -2172,11 +2170,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2193,8 +2193,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
@@ -2222,11 +2220,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2262,8 +2262,8 @@ SerDe Library:      	org.apache.hadoop.h
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
+Num Buckets:        	1                   	 
+Bucket Columns:     	[key]               	 
 Sort Columns:       	[Order(col:key, order:1)]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
@@ -2285,8 +2285,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.null, ]
@@ -2316,11 +2314,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2337,8 +2337,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.null, ]
@@ -2368,11 +2366,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2431,8 +2431,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.null, ]
@@ -2464,11 +2462,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]
@@ -2485,8 +2485,6 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE []
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.null, ]
@@ -2518,11 +2516,13 @@ POSTHOOK: Lineage: test_table PARTITION(
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ]

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inoutdriver.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inoutdriver.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inoutdriver.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inoutdriver.q.out Wed Apr 17 07:29:38 2013
@@ -7,8 +7,6 @@ PREHOOK: query: desc extended test
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended test
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	int                 	None                
 	 	 
 #### A masked pattern was here ####

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input1.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input1.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input1.q.out Wed Apr 17 07:29:38 2013
@@ -31,7 +31,5 @@ PREHOOK: query: DESCRIBE TEST1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	int                 	None                
 b                   	double              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input10.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input10.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input10.q.out Wed Apr 17 07:29:38 2013
@@ -31,8 +31,6 @@ PREHOOK: query: DESCRIBE TEST10
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST10
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                
 ds                  	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input15.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input15.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input15.q.out Wed Apr 17 07:29:38 2013
@@ -33,7 +33,5 @@ PREHOOK: query: DESCRIBE TEST15
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST15
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input17.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input17.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input17.q.out Wed Apr 17 07:29:38 2013
@@ -126,7 +126,7 @@ POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
-NULL	null
+NULL	NULL
 -1461153966	{"myint":49,"mystring":"343","underscore_int":7}
 -1952710705	{"myint":25,"mystring":"125","underscore_int":5}
 -734328905	{"myint":16,"mystring":"64","underscore_int":4}

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input2.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input2.q.out Wed Apr 17 07:29:38 2013
@@ -7,16 +7,12 @@ PREHOOK: query: DESCRIBE TEST2a
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST2a
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	int                 	None                
 b                   	double              	None                
 PREHOOK: query: DESC TEST2a
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESC TEST2a
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	int                 	None                
 b                   	double              	None                
 PREHOOK: query: CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
@@ -28,8 +24,6 @@ PREHOOK: query: DESCRIBE TEST2b
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST2b
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	array<int>          	None                
 b                   	double              	None                
 c                   	map<double,int>     	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input3.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input3.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input3.q.out Wed Apr 17 07:29:38 2013
@@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE TEST3a
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST3a
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	int                 	None                
 b                   	double              	None                
 PREHOOK: query: CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
@@ -20,8 +18,6 @@ PREHOOK: query: DESCRIBE TEST3b
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST3b
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	array<int>          	None                
 b                   	double              	None                
 c                   	map<double,int>     	None                
@@ -72,8 +68,6 @@ PREHOOK: query: DESCRIBE TEST3b
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST3b
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	array<int>          	None                
 b                   	double              	None                
 c                   	map<double,int>     	None                
@@ -112,8 +106,6 @@ PREHOOK: query: DESCRIBE TEST3c
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE TEST3c
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 a                   	array<int>          	None                
 b                   	double              	None                
 c                   	map<double,int>     	None                
@@ -165,8 +157,6 @@ PREHOOK: query: DESCRIBE EXTENDED TEST3c
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED TEST3c
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 r1                  	int                 	None                
 r2                  	double              	None                
 	 	 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input5.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input5.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input5.q.out Wed Apr 17 07:29:38 2013
@@ -126,6 +126,7 @@ POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
+NULL	NULL
 [0,0,0]	[{"myint":0,"mystring":"0","underscore_int":0}]
 [1,2,3]	[{"myint":1,"mystring":"1","underscore_int":1}]
 [2,4,6]	[{"myint":4,"mystring":"8","underscore_int":2}]
@@ -136,4 +137,3 @@ POSTHOOK: Lineage: dest1.value SCRIPT [(
 [7,14,21]	[{"myint":49,"mystring":"343","underscore_int":7}]
 [8,16,24]	[{"myint":64,"mystring":"512","underscore_int":8}]
 [9,18,27]	[{"myint":81,"mystring":"729","underscore_int":9}]
-null	null

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_columnarserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_columnarserde.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_columnarserde.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_columnarserde.q.out Wed Apr 17 07:29:38 2013
@@ -129,7 +129,7 @@ POSTHOOK: Lineage: input_columnarserde.e
 [7,14,21]	["70","700","7000"]	{"key_7":"value_7"}	-1461153973	record_7
 [8,16,24]	["80","800","8000"]	{"key_8":"value_8"}	1638581578	record_8
 [9,18,27]	["90","900","9000"]	{"key_9":"value_9"}	336964413	record_9
-null	null	null	0	NULL
+NULL	NULL	NULL	0	NULL
 PREHOOK: query: SELECT input_columnarserde.a[0], input_columnarserde.b[0], input_columnarserde.c['key2'], input_columnarserde.d, input_columnarserde.e FROM input_columnarserde DISTRIBUTE BY 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@input_columnarserde

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_dynamicserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_dynamicserde.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_dynamicserde.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_dynamicserde.q.out Wed Apr 17 07:29:38 2013
@@ -158,7 +158,7 @@ POSTHOOK: Lineage: dest1.e SIMPLE [(src_
 [7,14,21]	["70","700","7000"]	{"key_7":"value_7"}	-1461153973	record_7
 [8,16,24]	["80","800","8000"]	{"key_8":"value_8"}	1638581578	record_8
 [9,18,27]	["90","900","9000"]	{"key_9":"value_9"}	336964413	record_9
-null	null	null	0	NULL
+NULL	NULL	NULL	0	NULL
 PREHOOK: query: SELECT dest1.a[0], dest1.b[0], dest1.c['key2'], dest1.d, dest1.e FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_lazyserde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_lazyserde.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_lazyserde.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_lazyserde.q.out Wed Apr 17 07:29:38 2013
@@ -131,7 +131,7 @@ POSTHOOK: Lineage: dest1.e SIMPLE [(src_
 [7,14,21]	["70","700","7000"]	{"key_7":"value_7"}	-1461153973	record_7
 [8,16,24]	["80","800","8000"]	{"key_8":"value_8"}	1638581578	record_8
 [9,18,27]	["90","900","9000"]	{"key_9":"value_9"}	336964413	record_9
-null	null	null	0	NULL
+NULL	NULL	NULL	0	NULL
 PREHOOK: query: SELECT dest1.a[0], dest1.b[0], dest1.c['key2'], dest1.d, dest1.e FROM dest1 CLUSTER BY 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
@@ -217,7 +217,7 @@ POSTHOOK: Lineage: dest1.e SIMPLE [(src_
 [7,14,21]
 [8,16,24]
 [9,18,27]
-null
+NULL
 PREHOOK: query: DROP TABLE dest1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@dest1
@@ -283,4 +283,4 @@ POSTHOOK: Lineage: dest1.e SIMPLE [(src_
 {"key_7":"value_7"}
 {"key_8":"value_8"}
 {"key_9":"value_9"}
-null
+NULL

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_part10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_part10.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_part10.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_part10.q.out Wed Apr 17 07:29:38 2013
@@ -107,8 +107,6 @@ POSTHOOK: query: DESCRIBE EXTENDED part_
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE []
 POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE []
-# col_name            	data_type           	comment             
-	 	 
 a                   	string              	None                
 b                   	string              	None                
 ds                  	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_testxpath3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_testxpath3.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_testxpath3.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/input_testxpath3.q.out Wed Apr 17 07:29:38 2013
@@ -59,4 +59,4 @@ NULL	[36]
 NULL	[49]
 NULL	[64]
 value_9	[81]
-NULL	null
+NULL	NULL

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl2.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl2.q.out Wed Apr 17 07:29:38 2013
@@ -33,8 +33,6 @@ PREHOOK: query: DESCRIBE INPUTDDL2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE INPUTDDL2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                
 ds                  	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl3.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl3.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl3.q.out Wed Apr 17 07:29:38 2013
@@ -33,7 +33,5 @@ PREHOOK: query: DESCRIBE INPUTDDL3
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE INPUTDDL3
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	int                 	None                
 value               	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl4.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl4.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl4.q.out Wed Apr 17 07:29:38 2013
@@ -23,8 +23,6 @@ PREHOOK: query: DESCRIBE INPUTDDL4
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE INPUTDDL4
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 viewtime            	string              	None                
 userid              	int                 	None                
 page_url            	string              	None                
@@ -44,8 +42,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTD
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL4
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 viewtime            	string              	None                
 userid              	int                 	None                
 page_url            	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl5.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl5.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl5.q.out Wed Apr 17 07:29:38 2013
@@ -17,8 +17,6 @@ PREHOOK: query: DESCRIBE INPUTDDL5
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE INPUTDDL5
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 name                	string              	None                
 PREHOOK: query: SELECT INPUTDDL5.name from INPUTDDL5
 PREHOOK: type: QUERY

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl6.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl6.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl6.q.out Wed Apr 17 07:29:38 2013
@@ -27,8 +27,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTD
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	None                
 value               	string              	None                
 ds                  	string              	None                
@@ -43,8 +41,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTD
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	None                
 value               	string              	None                
 ds                  	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl7.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl7.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl7.q.out Wed Apr 17 07:29:38 2013
@@ -96,8 +96,6 @@ PREHOOK: query: DESCRIBE EXTENDED T1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED T1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 name                	string              	None                
 	 	 
 #### A masked pattern was here ####
@@ -105,8 +103,6 @@ PREHOOK: query: DESCRIBE EXTENDED T2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED T2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 name                	string              	None                
 	 	 
 #### A masked pattern was here ####
@@ -114,8 +110,6 @@ PREHOOK: query: DESCRIBE EXTENDED T3 PAR
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED T3 PARTITION (ds='2008-04-09')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 name                	string              	None                
 ds                  	string              	None                
 	 	 
@@ -129,8 +123,6 @@ PREHOOK: query: DESCRIBE EXTENDED T4 PAR
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED T4 PARTITION (ds='2008-04-09')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 name                	string              	None                
 ds                  	string              	None                
 	 	 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl8.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl8.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/inputddl8.q.out Wed Apr 17 07:29:38 2013
@@ -19,8 +19,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTD
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL8
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 aint                	int                 	from deserializer   
 astring             	string              	from deserializer   
 lint                	array<int>          	from deserializer   

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_thrift.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_thrift.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_thrift.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_thrift.q.out Wed Apr 17 07:29:38 2013
@@ -2,8 +2,6 @@ PREHOOK: query: DESCRIBE src_thrift
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE src_thrift
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 aint                	int                 	from deserializer   
 astring             	string              	from deserializer   
 lint                	array<int>          	from deserializer   
@@ -109,7 +107,7 @@ POSTHOOK: Input: default@src_thrift
 -1461153973	[{"myint":49,"mystring":"343","underscore_int":7}]
 -751827638	[{"myint":4,"mystring":"8","underscore_int":2}]
 -734328909	[{"myint":16,"mystring":"64","underscore_int":4}]
-0	null
+0	NULL
 336964413	[{"myint":81,"mystring":"729","underscore_int":9}]
 465985200	[{"myint":1,"mystring":"1","underscore_int":1}]
 477111222	[{"myint":9,"mystring":"27","underscore_int":3}]

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_view.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_view.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_view.q.out Wed Apr 17 07:29:38 2013
@@ -20,13 +20,11 @@ PREHOOK: query: -- test join views: see 
 
 create view v as select invites.bar, invites2.foo, invites2.ds from invites join invites2 on invites.ds=invites2.ds
 PREHOOK: type: CREATEVIEW
-#### A masked pattern was here ####
 POSTHOOK: query: -- test join views: see HIVE-1989
 
 create view v as select invites.bar, invites2.foo, invites2.ds from invites join invites2 on invites.ds=invites2.ds
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@v
-#### A masked pattern was here ####
 PREHOOK: query: explain select * from v where ds='2011-09-01'
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from v where ds='2011-09-01'