hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
Subject svn commit: r1636811 [1/2] - in /hive/trunk/ql/src/test: queries/clientpositive/ results/clientpositive/ results/clientpositive/tez/
Date Wed, 05 Nov 2014 07:25:35 GMT
Author: prasanthj
Date: Wed Nov  5 07:25:34 2014
New Revision: 1636811

URL: http://svn.apache.org/r1636811
Log:
HIVE-8720: Update orc_merge tests to make it consistent across OS'es (Prasanth J reviewed by Sergey Shelukhin)

Modified:
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge1.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge2.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge3.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge4.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
    hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
    hive/trunk/ql/src/test/results/clientpositive/orc_merge1.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge2.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge3.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge4.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge5.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge6.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge7.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out
    hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge4.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge1.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge1.q Wed Nov  5 07:25:34 2014
@@ -31,7 +31,7 @@ INSERT OVERWRITE TABLE orcfile_merge1 PA
     SELECT key, value, PMOD(HASH(key), 2) as part
     FROM src;
 
-DESC FORMATTED orcfile_merge1 partition (ds='1', part='0');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge1/ds=1/part=0/;
 
 set hive.merge.tezfiles=true;
 set hive.merge.mapfiles=true;
@@ -46,7 +46,7 @@ INSERT OVERWRITE TABLE orcfile_merge1b P
     SELECT key, value, PMOD(HASH(key), 2) as part
     FROM src;
 
-DESC FORMATTED orcfile_merge1b partition (ds='1', part='0');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge1b/ds=1/part=0/;
 
 set hive.merge.orcfile.stripe.level=true;
 -- auto-merge fast way
@@ -59,7 +59,7 @@ INSERT OVERWRITE TABLE orcfile_merge1c P
     SELECT key, value, PMOD(HASH(key), 2) as part
     FROM src;
 
-DESC FORMATTED orcfile_merge1c partition (ds='1', part='0');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge1c/ds=1/part=0/;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 -- Verify

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge2.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge2.q Wed Nov  5 07:25:34 2014
@@ -18,7 +18,7 @@ INSERT OVERWRITE TABLE orcfile_merge2a P
         PMOD(HASH(value), 10) as three
     FROM src;
 
-DESC FORMATTED orcfile_merge2a partition (one='1', two='0', three='2');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge2a/one=1/two=0/three=2/;
 
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c)

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge3.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge3.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge3.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge3.q Wed Nov  5 07:25:34 2014
@@ -19,7 +19,7 @@ EXPLAIN INSERT OVERWRITE TABLE orcfile_m
 INSERT OVERWRITE TABLE orcfile_merge3b
     SELECT key, value FROM orcfile_merge3a;
 
-DESC FORMATTED orcfile_merge3b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge3b/;
 
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge4.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge4.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge4.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge4.q Wed Nov  5 07:25:34 2014
@@ -11,7 +11,7 @@ set hive.merge.mapfiles=false;
 INSERT OVERWRITE TABLE orcfile_merge3a PARTITION (ds='1')
     SELECT * FROM src;
 
-DESC FORMATTED orcfile_merge3a PARTITION (ds='1');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge3a/ds=1/;
 
 set hive.merge.mapfiles=true;
 INSERT OVERWRITE TABLE orcfile_merge3a PARTITION (ds='1')
@@ -20,8 +20,8 @@ INSERT OVERWRITE TABLE orcfile_merge3a P
 INSERT OVERWRITE TABLE orcfile_merge3a PARTITION (ds='2')
     SELECT * FROM src;
 
-DESC FORMATTED orcfile_merge3a PARTITION (ds='1');
-DESC FORMATTED orcfile_merge3a PARTITION (ds='2');
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge3a/ds=1/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge3a/ds=2/;
 
 set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 EXPLAIN INSERT OVERWRITE TABLE orcfile_merge3b

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q Wed Nov  5 07:25:34 2014
@@ -23,7 +23,7 @@ insert overwrite table orc_merge5b selec
 
 -- 3 files total
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 
 set hive.merge.orcfile.stripe.level=true;
@@ -37,7 +37,7 @@ insert overwrite table orc_merge5b selec
 
 -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 
 set hive.merge.orcfile.stripe.level=false;
@@ -47,7 +47,7 @@ set hive.merge.mapredfiles=false;
 
 insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13;
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 
 set hive.merge.orcfile.stripe.level=true;
@@ -56,6 +56,6 @@ alter table orc_merge5b concatenate;
 
 -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q Wed Nov  5 07:25:34 2014
@@ -26,8 +26,8 @@ insert overwrite table orc_merge5a parti
 -- 3 files total
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan;
 analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan;
-desc formatted orc_merge5a partition(year="2000",hour=24);
-desc formatted orc_merge5a partition(year="2001",hour=24);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2000/hour=24/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2001/hour=24/;
 show partitions orc_merge5a;
 select * from orc_merge5a;
 
@@ -44,8 +44,8 @@ insert overwrite table orc_merge5a parti
 -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan;
 analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan;
-desc formatted orc_merge5a partition(year="2000",hour=24);
-desc formatted orc_merge5a partition(year="2001",hour=24);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2000/hour=24/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2001/hour=24/;
 show partitions orc_merge5a;
 select * from orc_merge5a;
 
@@ -58,8 +58,8 @@ insert overwrite table orc_merge5a parti
 insert overwrite table orc_merge5a partition (year="2001",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13;
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan;
 analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan;
-desc formatted orc_merge5a partition(year="2000",hour=24);
-desc formatted orc_merge5a partition(year="2001",hour=24);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2000/hour=24/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2001/hour=24/;
 show partitions orc_merge5a;
 select * from orc_merge5a;
 
@@ -71,8 +71,8 @@ alter table orc_merge5a partition(year="
 -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan;
 analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan;
-desc formatted orc_merge5a partition(year="2000",hour=24);
-desc formatted orc_merge5a partition(year="2001",hour=24);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2000/hour=24/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/year=2001/hour=24/;
 show partitions orc_merge5a;
 select * from orc_merge5a;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q Wed Nov  5 07:25:34 2014
@@ -30,8 +30,8 @@ insert overwrite table orc_merge5a parti
 -- 3 files total
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 
@@ -48,8 +48,8 @@ insert overwrite table orc_merge5a parti
 -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 
@@ -62,8 +62,8 @@ insert overwrite table orc_merge5a parti
 insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5;
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 
@@ -75,8 +75,8 @@ alter table orc_merge5a partition(st=0.8
 -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat1.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat1.q Wed Nov  5 07:25:34 2014
@@ -22,7 +22,7 @@ insert into table orc_merge5b select use
 
 -- 5 files total
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 
 set hive.merge.orcfile.stripe.level=true;
@@ -30,6 +30,6 @@ alter table orc_merge5b concatenate;
 
 -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind
 analyze table orc_merge5b compute statistics noscan;
-desc formatted orc_merge5b;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5b/;
 select * from orc_merge5b;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat2.q?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat2.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/orc_merge_incompat2.q Wed Nov  5 07:25:34 2014
@@ -32,8 +32,8 @@ insert into table orc_merge5a partition 
 
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 
@@ -44,8 +44,8 @@ alter table orc_merge5a partition(st=0.8
 
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan;
 analyze table orc_merge5a partition(st=0.8) compute statistics noscan;
-desc formatted orc_merge5a partition(st=80.0);
-desc formatted orc_merge5a partition(st=0.8);
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=80.0/;
+dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orc_merge5a/st=0.8/;
 show partitions orc_merge5a;
 select * from orc_merge5a where userid<=13;
 

Modified: hive/trunk/ql/src/test/results/clientpositive/orc_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge1.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge1.q.out Wed Nov  5 07:25:34 2014
@@ -110,48 +110,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            	2                   
-	numRows             	242                 
-	rawDataSize         	22748               
-	totalSize           	1747                
-#### 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 2 items
+#### A masked pattern was here ####
 PREHOOK: query: -- auto-merge slow way
 EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part)
@@ -266,48 +226,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           	1332                
-#### 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)
@@ -412,48 +332,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           	1623                
-#### 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/orc_merge2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge2.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge2.q.out Wed Nov  5 07:25:34 2014
@@ -173,49 +173,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/orc_merge3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge3.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge3.q.out Wed Nov  5 07:25:34 2014
@@ -142,42 +142,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           	4834                
+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/orc_merge4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge4.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/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/orc_merge5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge5.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge5.q.out Wed Nov  5 07:25:34 2014
@@ -97,45 +97,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
@@ -252,45 +215,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
@@ -323,45 +249,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
@@ -416,45 +305,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/orc_merge6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge6.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge6.q.out Wed Nov  5 07:25:34 2014
@@ -127,96 +127,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
@@ -376,96 +290,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
@@ -538,96 +366,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
@@ -720,96 +462,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/orc_merge7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge7.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge7.q.out Wed Nov  5 07:25:34 2014
@@ -160,94 +160,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
@@ -441,94 +357,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
@@ -640,94 +472,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
@@ -822,94 +570,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/orc_merge_incompat1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out?rev=1636811&r1=1636810&r2=1636811&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out Wed Nov  5 07:25:34 2014
@@ -148,45 +148,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
@@ -228,45 +191,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



Mime
View raw message