You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/11/05 08:25:35 UTC

svn commit: r1636811 [2/2] - in /hive/trunk/ql/src/test: queries/clientpositive/ results/clientpositive/ results/clientpositive/tez/

Modified: hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out Wed Nov  5 07:25:34 2014
@@ -218,94 +218,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	4                   
-	numRows             	4                   
-	rawDataSize         	1020                
-	totalSize           	2060                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 4 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	4                   
-	numRows             	8                   
-	rawDataSize         	2040                
-	totalSize           	2188                
+Found 4 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -407,94 +323,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	4                   
-	rawDataSize         	1020                
-	totalSize           	1819                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 3 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	8                   
-	rawDataSize         	2040                
-	totalSize           	1928                
+Found 3 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out Wed Nov  5 07:25:34 2014
@@ -117,48 +117,8 @@ POSTHOOK: Lineage: orcfile_merge1 PARTIT
 POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=0).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge1 partition (ds='1', part='0')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge1
-POSTHOOK: query: DESC FORMATTED orcfile_merge1 partition (ds='1', part='0')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge1
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-part                	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1, 0]              	 
-Database:           	default             	 
-Table:              	orcfile_merge1      	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	6                   
-	numRows             	242                 
-	rawDataSize         	22748               
-	totalSize           	3037                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 6 items
+#### A masked pattern was here ####
 PREHOOK: query: -- auto-merge slow way
 EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part)
@@ -286,48 +246,8 @@ POSTHOOK: Lineage: orcfile_merge1b PARTI
 POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=0).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge1b partition (ds='1', part='0')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge1b
-POSTHOOK: query: DESC FORMATTED orcfile_merge1b partition (ds='1', part='0')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge1b
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-part                	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1, 0]              	 
-Database:           	default             	 
-Table:              	orcfile_merge1b     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	242                 
-	rawDataSize         	22748               
-	totalSize           	1325                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: -- auto-merge fast way
 EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part)
@@ -447,48 +367,8 @@ POSTHOOK: Lineage: orcfile_merge1c PARTI
 POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=0).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge1c partition (ds='1', part='0')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge1c
-POSTHOOK: query: DESC FORMATTED orcfile_merge1c partition (ds='1', part='0')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge1c
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-part                	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1, 0]              	 
-Database:           	default             	 
-Table:              	orcfile_merge1c     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	242                 
-	rawDataSize         	22748               
-	totalSize           	2392                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: -- Verify
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c)

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge2.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge2.q.out Wed Nov  5 07:25:34 2014
@@ -146,49 +146,8 @@ POSTHOOK: Lineage: orcfile_merge2a PARTI
 POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=7).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=7).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge2a partition (one='1', two='0', three='2')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge2a
-POSTHOOK: query: DESC FORMATTED orcfile_merge2a partition (one='1', two='0', three='2')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge2a
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-one                 	string              	                    
-two                 	string              	                    
-three               	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1, 0, 2]           	 
-Database:           	default             	 
-Table:              	orcfile_merge2a     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	4                   
-	rawDataSize         	376                 
-	totalSize           	320                 
+Found 1 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
     FROM orcfile_merge2a

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge3.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge3.q.out Wed Nov  5 07:25:34 2014
@@ -115,42 +115,8 @@ POSTHOOK: Input: default@orcfile_merge3a
 POSTHOOK: Output: default@orcfile_merge3b
 POSTHOOK: Lineage: orcfile_merge3b.key SIMPLE [(orcfile_merge3a)orcfile_merge3a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: orcfile_merge3b.value SIMPLE [(orcfile_merge3a)orcfile_merge3a.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge3b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge3b
-POSTHOOK: query: DESC FORMATTED orcfile_merge3b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge3b
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	1000                
-	rawDataSize         	94000               
-	totalSize           	2538                
+Found 1 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM orcfile_merge3a

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge4.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge4.q.out Wed Nov  5 07:25:34 2014
@@ -36,47 +36,8 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@orcfile_merge3a@ds=1
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='1')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge3a
-POSTHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='1')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge3a
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1]                 	 
-Database:           	default             	 
-Table:              	orcfile_merge3a     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 1 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	500                 
-	rawDataSize         	47000               
-	totalSize           	2496                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge3a PARTITION (ds='1')
     SELECT * FROM src
 PREHOOK: type: QUERY
@@ -101,88 +62,10 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@orcfile_merge3a@ds=2
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='1')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge3a
-POSTHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='1')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge3a
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[1]                 	 
-Database:           	default             	 
-Table:              	orcfile_merge3a     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	500                 
-	rawDataSize         	47000               
-	totalSize           	2496                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='2')
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orcfile_merge3a
-POSTHOOK: query: DESC FORMATTED orcfile_merge3a PARTITION (ds='2')
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orcfile_merge3a
-# col_name            	data_type           	comment             
-	 	 
-key                 	int                 	                    
-value               	string              	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-ds                  	string              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2]                 	 
-Database:           	default             	 
-Table:              	orcfile_merge3a     	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 1 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	500                 
-	rawDataSize         	47000               
-	totalSize           	2496                
+Found 1 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE orcfile_merge3b
     SELECT key, value FROM orcfile_merge3a
 PREHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out Wed Nov  5 07:25:34 2014
@@ -104,45 +104,8 @@ analyze table orc_merge5b compute statis
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 3 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
@@ -274,45 +237,8 @@ analyze table orc_merge5b compute statis
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
@@ -345,45 +271,8 @@ POSTHOOK: query: analyze table orc_merge
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 3 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
@@ -438,45 +327,8 @@ analyze table orc_merge5b compute statis
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out Wed Nov  5 07:25:34 2014
@@ -134,96 +134,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
-PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2000, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2001, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 3 items
+#### A masked pattern was here ####
+Found 3 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -398,96 +312,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
-PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2000, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2001, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -560,96 +388,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
-PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2000, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2001, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	1133                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 3 items
+#### A masked pattern was here ####
+Found 3 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -742,96 +484,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
-PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2000, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(year="2001",hour=24)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-year                	string              	                    
-hour                	int                 	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[2001, 24]          	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	765                 
-	totalSize           	899                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out Wed Nov  5 07:25:34 2014
@@ -167,94 +167,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	1                   
-	rawDataSize         	255                 
-	totalSize           	513                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	2                   
-	numRows             	2                   
-	rawDataSize         	510                 
-	totalSize           	1044                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 2 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -463,94 +379,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	1                   
-	rawDataSize         	255                 
-	totalSize           	513                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	2                   
-	rawDataSize         	510                 
-	totalSize           	838                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -662,94 +494,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	1                   
-	rawDataSize         	255                 
-	totalSize           	513                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	2                   
-	numRows             	2                   
-	rawDataSize         	510                 
-	totalSize           	1044                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 2 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -844,94 +592,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	1                   
-	rawDataSize         	255                 
-	totalSize           	513                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	1                   
-	numRows             	2                   
-	rawDataSize         	510                 
-	totalSize           	838                 
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 1 items
+#### A masked pattern was here ####
+Found 1 items
+#### A masked pattern was here ####
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out Wed Nov  5 07:25:34 2014
@@ -155,45 +155,8 @@ analyze table orc_merge5b compute statis
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	5                   
-	numRows             	15                  
-	rawDataSize         	3825                
-	totalSize           	2877                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 5 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b
@@ -235,45 +198,8 @@ analyze table orc_merge5b compute statis
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
-PREHOOK: query: desc formatted orc_merge5b
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5b
-POSTHOOK: query: desc formatted orc_merge5b
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5b
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# 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:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	15                  
-	rawDataSize         	3825                
-	totalSize           	2340                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
+Found 3 items
+#### A masked pattern was here ####
 PREHOOK: query: select * from orc_merge5b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_merge5b

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out Wed Nov  5 07:25:34 2014
@@ -225,94 +225,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	4                   
-	numRows             	4                   
-	rawDataSize         	1020                
-	totalSize           	2060                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 4 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	4                   
-	numRows             	8                   
-	rawDataSize         	2040                
-	totalSize           	2188                
+Found 4 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a
@@ -414,94 +330,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
-PREHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=80.0)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[80.0]              	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
-#### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	4                   
-	rawDataSize         	1020                
-	totalSize           	1819                
-#### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
-PREHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@orc_merge5a
-POSTHOOK: query: desc formatted orc_merge5a partition(st=0.8)
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@orc_merge5a
-# col_name            	data_type           	comment             
-	 	 
-userid              	bigint              	                    
-string1             	string              	                    
-subtype             	double              	                    
-decimal1            	decimal(10,0)       	                    
-ts                  	timestamp           	                    
-	 	 
-# Partition Information	 	 
-# col_name            	data_type           	comment             
-	 	 
-st                  	double              	                    
-	 	 
-# Detailed Partition Information	 	 
-Partition Value:    	[0.8]               	 
-Database:           	default             	 
-Table:              	orc_merge5a         	 
-#### A masked pattern was here ####
-Protect Mode:       	None                	 
+Found 3 items
 #### A masked pattern was here ####
-Partition Parameters:	 	 
-	COLUMN_STATS_ACCURATE	true                
-	numFiles            	3                   
-	numRows             	8                   
-	rawDataSize         	2040                
-	totalSize           	1928                
+Found 3 items
 #### A masked pattern was here ####
-	 	 
-# Storage Information	 	 
-SerDe Library:      	org.apache.hadoop.hive.ql.io.orc.OrcSerde	 
-InputFormat:        	org.apache.hadoop.hive.ql.io.orc.OrcInputFormat	 
-OutputFormat:       	org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat	 
-Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
-Storage Desc Params:	 	 
-	serialization.format	1                   
 PREHOOK: query: show partitions orc_merge5a
 PREHOOK: type: SHOWPARTITIONS
 PREHOOK: Input: default@orc_merge5a