You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/10/06 05:44:26 UTC

svn commit: r1629562 [31/38] - in /hive/branches/spark: ./ accumulo-handler/ beeline/ beeline/src/java/org/apache/hive/beeline/ bin/ext/ common/ common/src/java/org/apache/hadoop/hive/conf/ common/src/test/org/apache/hadoop/hive/common/type/ contrib/sr...

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/mrr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/mrr.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/mrr.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/mrr.q.out Mon Oct  6 03:44:13 2014
@@ -439,7 +439,7 @@ STAGE PLANS:
                       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
@@ -867,8 +867,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col5, _col6
-                      input vertices:
-                        1 Map 1
                       Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col5 (type: string), _col6 (type: string)
@@ -1426,7 +1424,7 @@ STAGE PLANS:
                   value expressions: _col1 (type: bigint)
         Reducer 4 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                      Inner Join 0 to 2
@@ -1708,8 +1706,6 @@ STAGE PLANS:
                         0 _col0 (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      input vertices:
-                        0 Reducer 3
                       Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: bigint), _col2 (type: string), _col3 (type: string)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out Mon Oct  6 03:44:13 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_analyze.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_analyze.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_analyze.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_analyze.q.out Mon Oct  6 03:44:13 2014
@@ -73,11 +73,9 @@ POSTHOOK: Lineage: orc_create_people.sta
 POSTHOOK: Lineage: orc_create_people.state SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:state, type:string, comment:null), ]
 PREHOOK: query: analyze table orc_create_people compute statistics partialscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
 PREHOOK: Output: default@orc_create_people
 POSTHOOK: query: analyze table orc_create_people compute statistics partialscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
 PREHOOK: query: desc formatted orc_create_people
 PREHOOK: type: DESCTABLE
@@ -107,7 +105,7 @@ Table Parameters:	 	 
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
-	totalSize           	3121                
+	totalSize           	3123                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -197,7 +195,7 @@ Table Parameters:	 	 
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
-	totalSize           	3121                
+	totalSize           	3123                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -271,13 +269,11 @@ POSTHOOK: Lineage: orc_create_people PAR
 POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ]
 PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
 PREHOOK: Output: default@orc_create_people
 PREHOOK: Output: default@orc_create_people@state=Ca
 PREHOOK: Output: default@orc_create_people@state=Or
 POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people@state=Ca
 POSTHOOK: Output: default@orc_create_people@state=Or
@@ -585,13 +581,11 @@ POSTHOOK: Lineage: orc_create_people PAR
 POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ]
 PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
 PREHOOK: Output: default@orc_create_people
 PREHOOK: Output: default@orc_create_people@state=Ca
 PREHOOK: Output: default@orc_create_people@state=Or
 POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people@state=Ca
 POSTHOOK: Output: default@orc_create_people@state=Or
@@ -627,7 +621,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	21980               
-	totalSize           	4959                
+	totalSize           	4963                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -672,7 +666,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22048               
-	totalSize           	5044                
+	totalSize           	5051                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -780,7 +774,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	21980               
-	totalSize           	4959                
+	totalSize           	4963                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -825,7 +819,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22048               
-	totalSize           	5044                
+	totalSize           	5051                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -948,14 +942,12 @@ POSTHOOK: Input: default@orc_create_peop
 POSTHOOK: Output: default@orc_create_people
 PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_create_people
 PREHOOK: Output: default@orc_create_people
 PREHOOK: Output: default@orc_create_people@state=Ca
 PREHOOK: Output: default@orc_create_people@state=OH
 PREHOOK: Output: default@orc_create_people@state=Or
 POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people
 POSTHOOK: Output: default@orc_create_people@state=Ca
 POSTHOOK: Output: default@orc_create_people@state=OH

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge1.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge1.q.out Mon Oct  6 03:44:13 2014
@@ -146,7 +146,7 @@ Partition Parameters:	 	 
 	numFiles            	6                   
 	numRows             	242                 
 	rawDataSize         	22748               
-	totalSize           	3037                
+	totalSize           	3046                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -315,7 +315,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	242                 
 	rawDataSize         	22748               
-	totalSize           	1325                
+	totalSize           	1328                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -476,7 +476,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	242                 
 	rawDataSize         	22748               
-	totalSize           	2392                
+	totalSize           	2401                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge5.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge5.q.out Mon Oct  6 03:44:13 2014
@@ -97,12 +97,10 @@ POSTHOOK: Lineage: orc_merge5b.userid SI
 PREHOOK: query: -- 3 files total
 analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: -- 3 files total
 analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -130,7 +128,7 @@ Table Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -267,12 +265,10 @@ POSTHOOK: Lineage: orc_merge5b.userid SI
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -300,7 +296,7 @@ Table Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -339,11 +335,9 @@ POSTHOOK: Lineage: orc_merge5b.ts SIMPLE
 POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
 PREHOOK: query: analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -371,7 +365,7 @@ Table Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -431,12 +425,10 @@ POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -464,7 +456,7 @@ Table Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge6.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge6.q.out Mon Oct  6 03:44:13 2014
@@ -115,23 +115,19 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 PREHOOK: query: -- 3 files total
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
 POSTHOOK: query: -- 3 files total
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24
 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2001/hour=24
 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 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)
@@ -166,7 +162,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -211,7 +207,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -379,23 +375,19 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24
 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2001/hour=24
 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 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)
@@ -430,7 +422,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -475,7 +467,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -542,22 +534,18 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
 PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
 POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24
 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2001/hour=24
 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 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)
@@ -592,7 +580,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -637,7 +625,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	1133                
+	totalSize           	1141                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -723,23 +711,19 @@ POSTHOOK: Output: default@orc_merge5a@ye
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2000/hour=24
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24
 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@year=2001/hour=24
 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan
 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)
@@ -774,7 +758,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -819,7 +803,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	765                 
-	totalSize           	899                 
+	totalSize           	907                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge7.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge7.q.out Mon Oct  6 03:44:13 2014
@@ -148,23 +148,19 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 PREHOOK: query: -- 3 files total
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: -- 3 files total
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -198,7 +194,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	255                 
-	totalSize           	513                 
+	totalSize           	521                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -242,7 +238,7 @@ Partition Parameters:	 	 
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	510                 
-	totalSize           	1044                
+	totalSize           	1058                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -444,23 +440,19 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -494,7 +486,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	255                 
-	totalSize           	513                 
+	totalSize           	521                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -538,7 +530,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	510                 
-	totalSize           	838                 
+	totalSize           	852                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -644,22 +636,18 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
 PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -693,7 +681,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	255                 
-	totalSize           	513                 
+	totalSize           	521                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -737,7 +725,7 @@ Partition Parameters:	 	 
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	510                 
-	totalSize           	1044                
+	totalSize           	1058                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -825,23 +813,19 @@ POSTHOOK: Output: default@orc_merge5a@st
 PREHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: -- 1 file after merging
 analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -875,7 +859,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	255                 
-	totalSize           	513                 
+	totalSize           	521                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -919,7 +903,7 @@ Partition Parameters:	 	 
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	510                 
-	totalSize           	838                 
+	totalSize           	852                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out Mon Oct  6 03:44:13 2014
@@ -148,12 +148,10 @@ POSTHOOK: Lineage: orc_merge5b.userid SI
 PREHOOK: query: -- 5 files total
 analyze table orc_merge5b compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: -- 5 files total
 analyze table orc_merge5b compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -181,7 +179,7 @@ Table Parameters:	 	 
 	numFiles            	5                   
 	numRows             	15                  
 	rawDataSize         	3825                
-	totalSize           	2877                
+	totalSize           	2862                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -228,12 +226,10 @@ POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: -- 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
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5b
 PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: -- 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
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5b
 POSTHOOK: Output: default@orc_merge5b
 PREHOOK: query: desc formatted orc_merge5b
 PREHOOK: type: DESCTABLE
@@ -261,7 +257,7 @@ Table Parameters:	 	 
 	numFiles            	3                   
 	numRows             	15                  
 	rawDataSize         	3825                
-	totalSize           	2340                
+	totalSize           	2325                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out Mon Oct  6 03:44:13 2014
@@ -207,22 +207,18 @@ POSTHOOK: Lineage: orc_merge5a PARTITION
 POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ]
 PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -256,7 +252,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	4                   
 	rawDataSize         	1020                
-	totalSize           	2060                
+	totalSize           	2092                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -300,7 +296,7 @@ Partition Parameters:	 	 
 	numFiles            	4                   
 	numRows             	8                   
 	rawDataSize         	2040                
-	totalSize           	2188                
+	totalSize           	2204                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -396,22 +392,18 @@ POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=0.8
 PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a
 POSTHOOK: Output: default@orc_merge5a@st=80.0
 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a
 PREHOOK: Output: default@orc_merge5a@st=0.8
 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan
 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)
@@ -445,7 +437,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	4                   
 	rawDataSize         	1020                
-	totalSize           	1819                
+	totalSize           	1851                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -489,7 +481,7 @@ Partition Parameters:	 	 
 	numFiles            	3                   
 	numRows             	8                   
 	rawDataSize         	2040                
-	totalSize           	1928                
+	totalSize           	1944                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/select_dummy_source.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/select_dummy_source.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/select_dummy_source.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/select_dummy_source.q.out Mon Oct  6 03:44:13 2014
@@ -239,20 +239,37 @@ explain
 select 2 + 3,x from (select 1 + 2 x) X
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-0 is a root stage
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: _dummy_table
+                  Row Limit Per Split: 1
+                  Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE
+                  Select Operator
+                    expressions: 5 (type: int), 3 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE
+                    File Output Operator
+                      compressed: false
+                      Statistics: Num rows: 0 Data size: 1 Basic stats: PARTIAL Column stats: COMPLETE
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
   Stage: Stage-0
     Fetch Operator
       limit: -1
       Processor Tree:
-        TableScan
-          alias: _dummy_table
-          Row Limit Per Split: 1
-          Select Operator
-            expressions: 5 (type: int), 3 (type: int)
-            outputColumnNames: _col0, _col1
-            ListSink
+        ListSink
 
 PREHOOK: query: select 2 + 3,x from (select 1 + 2 x) X
 PREHOOK: type: QUERY

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_exists.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_exists.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_exists.q.out Mon Oct  6 03:44:13 2014
@@ -66,7 +66,7 @@ STAGE PLANS:
                           Statistics: Num rows: 42 Data size: 446 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_in.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_in.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_in.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/subquery_in.q.out Mon Oct  6 03:44:13 2014
@@ -159,7 +159,7 @@ STAGE PLANS:
                       value expressions: value (type: string)
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:
@@ -276,7 +276,7 @@ STAGE PLANS:
                           Statistics: Num rows: 42 Data size: 446 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:
@@ -439,7 +439,7 @@ STAGE PLANS:
                         Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
         Reducer 4 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:
@@ -545,7 +545,7 @@ STAGE PLANS:
                     value expressions: p_mfgr (type: string), p_size (type: int)
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:
@@ -714,7 +714,7 @@ STAGE PLANS:
                           Statistics: Num rows: 42 Data size: 446 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:
@@ -901,7 +901,7 @@ STAGE PLANS:
                           Statistics: Num rows: 432 Data size: 3024 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
@@ -917,7 +917,7 @@ STAGE PLANS:
                   value expressions: _col0 (type: int), _col3 (type: int)
         Reducer 3 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Semi Join 0 to 1
                 condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_bmj_schema_evolution.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_bmj_schema_evolution.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_bmj_schema_evolution.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_bmj_schema_evolution.q.out Mon Oct  6 03:44:13 2014
@@ -113,8 +113,6 @@ STAGE PLANS:
                         0 key (type: int)
                         1 key (type: int)
                       outputColumnNames: _col0, _col1
-                      input vertices:
-                        1 Map 1
                       Statistics: Num rows: 550 Data size: 28771 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: int), _col1 (type: string)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out Mon Oct  6 03:44:13 2014
@@ -63,7 +63,7 @@ STAGE PLANS:
                       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out Mon Oct  6 03:44:13 2014
@@ -52,7 +52,7 @@ STAGE PLANS:
                     Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Outer Join0 to 1
                 condition expressions:
@@ -83,7 +83,7 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
         Reducer 4 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Right Outer Join0 to 1
                 condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out Mon Oct  6 03:44:13 2014
@@ -52,7 +52,7 @@ STAGE PLANS:
                     Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Left Outer Join0 to 1
                 condition expressions:
@@ -83,7 +83,7 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
         Reducer 4 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Right Outer Join0 to 1
                 condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_union.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_union.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_union.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/tez_union.q.out Mon Oct  6 03:44:13 2014
@@ -36,8 +36,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0, _col1
-                      input vertices:
-                        1 Map 3
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string)
                         outputColumnNames: _col0, _col1
@@ -220,7 +218,7 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: string)
         Reducer 3 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions:
@@ -357,8 +355,6 @@ STAGE PLANS:
                           0 key (type: string)
                           1 _col0 (type: string)
                         outputColumnNames: _col0, _col5
-                        input vertices:
-                          0 Map 1
                         Select Operator
                           expressions: _col0 (type: string), _col5 (type: string)
                           outputColumnNames: _col0, _col1
@@ -387,8 +383,6 @@ STAGE PLANS:
                           0 key (type: string)
                           1 _col0 (type: string)
                         outputColumnNames: _col0, _col5
-                        input vertices:
-                          0 Map 1
                         Select Operator
                           expressions: _col0 (type: string), _col5 (type: string)
                           outputColumnNames: _col0, _col1
@@ -541,8 +535,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0
-                      input vertices:
-                        1 Map 5
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
@@ -559,9 +551,6 @@ STAGE PLANS:
                             1 _col0 (type: string)
                             2 key (type: string)
                           outputColumnNames: _col0, _col5, _col6
-                          input vertices:
-                            0 Map 1
-                            2 Map 8
                           Select Operator
                             expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -611,8 +600,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0
-                      input vertices:
-                        1 Map 6
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
@@ -629,9 +616,6 @@ STAGE PLANS:
                             1 _col0 (type: string)
                             2 key (type: string)
                           outputColumnNames: _col0, _col5, _col6
-                          input vertices:
-                            0 Map 1
-                            2 Map 8
                           Select Operator
                             expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -678,8 +662,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0
-                      input vertices:
-                        1 Map 10
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
@@ -696,9 +678,6 @@ STAGE PLANS:
                             1 _col0 (type: string)
                             2 key (type: string)
                           outputColumnNames: _col0, _col5, _col6
-                          input vertices:
-                            0 Map 1
-                            2 Map 8
                           Select Operator
                             expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -904,8 +883,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0
-                      input vertices:
-                        1 Map 3
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
@@ -947,8 +924,6 @@ STAGE PLANS:
                         0 key (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0
-                      input vertices:
-                        1 Map 5
                       Select Operator
                         expressions: _col0 (type: string)
                         outputColumnNames: _col0
@@ -1082,8 +1057,6 @@ STAGE PLANS:
                         0 _col0 (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      input vertices:
-                        1 Map 3
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
@@ -1127,8 +1100,6 @@ STAGE PLANS:
                         0 _col0 (type: string)
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      input vertices:
-                        1 Map 3
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
@@ -1196,8 +1167,6 @@ STAGE PLANS:
                       0 _col0 (type: string)
                       1 key (type: string)
                     outputColumnNames: _col0, _col2
-                    input vertices:
-                      0 Union 2
                     Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), _col2 (type: string)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/union7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/union7.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/union7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/union7.q.out Mon Oct  6 03:44:13 2014
@@ -92,14 +92,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE Column stats: PARTIAL
+                Statistics: Num rows: 13 Data size: 1300 Basic stats: COMPLETE Column stats: PARTIAL
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: bigint)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 13 Data size: 1300 Basic stats: COMPLETE Column stats: PARTIAL
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE Column stats: PARTIAL
+                    Statistics: Num rows: 13 Data size: 1300 Basic stats: COMPLETE Column stats: PARTIAL
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_types.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_types.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_types.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/update_all_types.q.out Mon Oct  6 03:44:13 2014
@@ -151,37 +151,3 @@ NULL	-5470	-1072076362	1864027286	NULL	-
 NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1970-01-01	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
 11	NULL	-1069736047	-453772520	11.0	NULL	11.0	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
 1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true
-PREHOOK: query: update acid_uat set
-  ti = ti * 2,
-  si = cast(f as int),
-  d = floor(de)
-  where s = 'aw724t8c5558x2xneC624'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@acid_uat
-PREHOOK: Output: default@acid_uat
-POSTHOOK: query: update acid_uat set
-  ti = ti * 2,
-  si = cast(f as int),
-  d = floor(de)
-  where s = 'aw724t8c5558x2xneC624'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@acid_uat
-POSTHOOK: Output: default@acid_uat
-PREHOOK: query: select * from acid_uat order by i
-PREHOOK: type: QUERY
-PREHOOK: Input: default@acid_uat
-#### A masked pattern was here ####
-POSTHOOK: query: select * from acid_uat order by i
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@acid_uat
-#### A masked pattern was here ####
-11	NULL	-1073279343	-1595604468	11.0	NULL	11.0	1969-12-31 16:00:02.351	NULL	oj1YrV5Wa	oj1YrV5Wa	P76636jJ6qM17d7DIy                  	true
-NULL	-7382	-1073051226	-1887561756	NULL	-7382.0	NULL	NULL	1970-01-01	A34p7oRr2WvUJNf	A34p7oRr2WvUJNf	4hA4KQj2vD3fI6gX82220d              	false
-11	NULL	-1072910839	2048385991	11.0	NULL	11.0	1969-12-31 16:00:02.351	NULL	0iqrc5	0iqrc5	KbaDXiN85adbHRx58v                  	false
-NULL	8373	-1072081801	1864027286	NULL	8373.0	NULL	NULL	1970-01-01	dPkN74F7	dPkN74F7	4KWs6gw7lv2WYd66P                   	true
-NULL	-5470	-1072076362	1864027286	NULL	-5470.0	NULL	NULL	1970-01-01	2uLyD28144vklju213J1mr	2uLyD28144vklju213J1mr	4KWs6gw7lv2WYd66P                   	true
--102	-51	-1071480828	-1401575336	-51.0	-51.0	-51.0	1969-12-31 16:00:08.451	NULL	aw724t8c5558x2xneC624	aw724t8c5558x2xneC624	4uE7l74tESBiKfu7c8wM7GA             	true
-8	NULL	-1071363017	1349676361	8.0	NULL	8.0	1969-12-31 16:00:15.892	NULL	Anj0oF	Anj0oF	IwE1G7Qb0B1NEfV030g                 	true
-NULL	-947	-1070551679	1864027286	NULL	-947.0	NULL	NULL	1970-01-01	iUR3Q	iUR3Q	4KWs6gw7lv2WYd66P                   	false
-11	NULL	-1069736047	-453772520	11.0	NULL	11.0	1969-12-31 16:00:02.351	NULL	k17Am8uPHWk02cEf1jet	k17Am8uPHWk02cEf1jet	qrXLLNX1                            	true
-1	2	3	4	3.14	6.28	5.99	NULL	2014-09-01	its a beautiful day in the neighbhorhood	a beautiful day for a neighbor	wont you be mine                    	true

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_char_simple.q.out Mon Oct  6 03:44:13 2014
@@ -234,109 +234,3 @@ POSTHOOK: query: drop table char_2
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@char_2
 POSTHOOK: Output: default@char_2
-PREHOOK: query: -- Implicit conversion.  Occurs in reduce-side under Tez.
-create table char_3 (
-  field char(12)
-) stored as orc
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@char_3
-POSTHOOK: query: -- Implicit conversion.  Occurs in reduce-side under Tez.
-create table char_3 (
-  field char(12)
-) stored as orc
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@char_3
-PREHOOK: query: explain
-insert into table char_3 select cint from alltypesorc limit 10
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-insert into table char_3 select cint from alltypesorc limit 10
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: alltypesorc
-                  Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: cint (type: int)
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 10
-                      Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: int)
-            Execution mode: vectorized
-        Reducer 2 
-            Reduce Operator Tree:
-              Select Operator
-                expressions: VALUE._col0 (type: int)
-                outputColumnNames: _col0
-                Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                Limit
-                  Number of rows: 10
-                  Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: CAST( _col0 AS CHAR(12) (type: char(12))
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                      table:
-                          input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-                          serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                          name: default.char_3
-            Execution mode: vectorized
-
-  Stage: Stage-2
-    Dependency Collection
-
-  Stage: Stage-0
-    Move Operator
-      tables:
-          replace: false
-          table:
-              input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-              output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-              serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              name: default.char_3
-
-  Stage: Stage-3
-    Stats-Aggr Operator
-
-PREHOOK: query: insert into table char_3 select cint from alltypesorc limit 10
-PREHOOK: type: QUERY
-PREHOOK: Input: default@alltypesorc
-PREHOOK: Output: default@char_3
-POSTHOOK: query: insert into table char_3 select cint from alltypesorc limit 10
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alltypesorc
-POSTHOOK: Output: default@char_3
-POSTHOOK: Lineage: char_3.field EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
-PREHOOK: query: drop table char_3
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@char_3
-PREHOOK: Output: default@char_3
-POSTHOOK: query: drop table char_3
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@char_3
-POSTHOOK: Output: default@char_3

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out Mon Oct  6 03:44:13 2014
@@ -54,8 +54,6 @@ STAGE PLANS:
                       0 cint (type: int)
                       1 cint (type: int)
                     outputColumnNames: _col0
-                    input vertices:
-                      1 Map 4
                     Statistics: Num rows: 13516 Data size: 414960 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -66,8 +64,6 @@ STAGE PLANS:
                       keys:
                         0 _col0 (type: tinyint)
                         1 ctinyint (type: tinyint)
-                      input vertices:
-                        1 Map 1
                       Statistics: Num rows: 14867 Data size: 456456 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         Statistics: Num rows: 14867 Data size: 456456 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_mapjoin_reduce.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_mapjoin_reduce.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_mapjoin_reduce.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_mapjoin_reduce.q.out Mon Oct  6 03:44:13 2014
@@ -204,8 +204,6 @@ STAGE PLANS:
                       0 _col0 (type: int)
                       1 l_partkey (type: int)
                     outputColumnNames: _col0, _col1, _col3
-                    input vertices:
-                      1 Map 1
                     Statistics: Num rows: 831 Data size: 3326 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -217,8 +215,6 @@ STAGE PLANS:
                         0 _col1 (type: int)
                         1 _col0 (type: int)
                       outputColumnNames: _col0, _col3
-                      input vertices:
-                        1 Map 4
                       Statistics: Num rows: 914 Data size: 3658 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: int), _col3 (type: int)
@@ -367,8 +363,6 @@ STAGE PLANS:
                       0 _col0 (type: int)
                       1 l_partkey (type: int)
                     outputColumnNames: _col0, _col1, _col3
-                    input vertices:
-                      1 Map 1
                     Statistics: Num rows: 831 Data size: 3326 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -380,8 +374,6 @@ STAGE PLANS:
                         0 _col1 (type: int), 1 (type: int)
                         1 _col0 (type: int), _col1 (type: int)
                       outputColumnNames: _col0, _col3
-                      input vertices:
-                        1 Map 4
                       Statistics: Num rows: 914 Data size: 3658 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: int), _col3 (type: int)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_varchar_simple.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_varchar_simple.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_varchar_simple.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vector_varchar_simple.q.out Mon Oct  6 03:44:13 2014
@@ -1,31 +1,31 @@
-PREHOOK: query: drop table varchar_2
+PREHOOK: query: drop table char_2
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table varchar_2
+POSTHOOK: query: drop table char_2
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table varchar_2 (
+PREHOOK: query: create table char_2 (
   key varchar(10),
   value varchar(20)
 ) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-PREHOOK: Output: default@varchar_2
-POSTHOOK: query: create table varchar_2 (
+PREHOOK: Output: default@char_2
+POSTHOOK: query: create table char_2 (
   key varchar(10),
   value varchar(20)
 ) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
-POSTHOOK: Output: default@varchar_2
-PREHOOK: query: insert overwrite table varchar_2 select * from src
+POSTHOOK: Output: default@char_2
+PREHOOK: query: insert overwrite table char_2 select * from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: default@varchar_2
-POSTHOOK: query: insert overwrite table varchar_2 select * from src
+PREHOOK: Output: default@char_2
+POSTHOOK: query: insert overwrite table char_2 select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@varchar_2
-POSTHOOK: Lineage: varchar_2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: varchar_2.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Output: default@char_2
+POSTHOOK: Lineage: char_2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: char_2.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: select key, value
 from src
 order by key asc
@@ -46,12 +46,12 @@ POSTHOOK: Input: default@src
 10	val_10
 100	val_100
 PREHOOK: query: explain select key, value
-from varchar_2
+from char_2
 order by key asc
 limit 5
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select key, value
-from varchar_2
+from char_2
 order by key asc
 limit 5
 POSTHOOK: type: QUERY
@@ -69,7 +69,7 @@ STAGE PLANS:
         Map 1 
             Map Operator Tree:
                 TableScan
-                  alias: varchar_2
+                  alias: char_2
                   Statistics: Num rows: 500 Data size: 88000 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: varchar(10)), value (type: varchar(20))
@@ -107,19 +107,19 @@ STAGE PLANS:
 
 PREHOOK: query: -- should match the query from src
 select key, value
-from varchar_2
+from char_2
 order by key asc
 limit 5
 PREHOOK: type: QUERY
-PREHOOK: Input: default@varchar_2
+PREHOOK: Input: default@char_2
 #### A masked pattern was here ####
 POSTHOOK: query: -- should match the query from src
 select key, value
-from varchar_2
+from char_2
 order by key asc
 limit 5
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@varchar_2
+POSTHOOK: Input: default@char_2
 #### A masked pattern was here ####
 0	val_0
 0	val_0
@@ -146,12 +146,12 @@ POSTHOOK: Input: default@src
 97	val_97
 96	val_96
 PREHOOK: query: explain select key, value
-from varchar_2
+from char_2
 order by key desc
 limit 5
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select key, value
-from varchar_2
+from char_2
 order by key desc
 limit 5
 POSTHOOK: type: QUERY
@@ -169,7 +169,7 @@ STAGE PLANS:
         Map 1 
             Map Operator Tree:
                 TableScan
-                  alias: varchar_2
+                  alias: char_2
                   Statistics: Num rows: 500 Data size: 88000 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: varchar(10)), value (type: varchar(20))
@@ -207,136 +207,30 @@ STAGE PLANS:
 
 PREHOOK: query: -- should match the query from src
 select key, value
-from varchar_2
+from char_2
 order by key desc
 limit 5
 PREHOOK: type: QUERY
-PREHOOK: Input: default@varchar_2
+PREHOOK: Input: default@char_2
 #### A masked pattern was here ####
 POSTHOOK: query: -- should match the query from src
 select key, value
-from varchar_2
+from char_2
 order by key desc
 limit 5
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@varchar_2
+POSTHOOK: Input: default@char_2
 #### A masked pattern was here ####
 98	val_98
 98	val_98
 97	val_97
 97	val_97
 96	val_96
-PREHOOK: query: drop table varchar_2
+PREHOOK: query: drop table char_2
 PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@varchar_2
-PREHOOK: Output: default@varchar_2
-POSTHOOK: query: drop table varchar_2
+PREHOOK: Input: default@char_2
+PREHOOK: Output: default@char_2
+POSTHOOK: query: drop table char_2
 POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@varchar_2
-POSTHOOK: Output: default@varchar_2
-PREHOOK: query: -- Implicit conversion.  Occurs in reduce-side under Tez.
-create table varchar_3 (
-  field varchar(25)
-) stored as orc
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@varchar_3
-POSTHOOK: query: -- Implicit conversion.  Occurs in reduce-side under Tez.
-create table varchar_3 (
-  field varchar(25)
-) stored as orc
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@varchar_3
-PREHOOK: query: explain
-insert into table varchar_3 select cint from alltypesorc limit 10
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-insert into table varchar_3 select cint from alltypesorc limit 10
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: alltypesorc
-                  Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: cint (type: int)
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 10
-                      Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: int)
-            Execution mode: vectorized
-        Reducer 2 
-            Reduce Operator Tree:
-              Select Operator
-                expressions: VALUE._col0 (type: int)
-                outputColumnNames: _col0
-                Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                Limit
-                  Number of rows: 10
-                  Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: CAST( _col0 AS varchar(25)) (type: varchar(25))
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                    File Output Operator
-                      compressed: false
-                      Statistics: Num rows: 10 Data size: 300 Basic stats: COMPLETE Column stats: NONE
-                      table:
-                          input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-                          serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                          name: default.varchar_3
-            Execution mode: vectorized
-
-  Stage: Stage-2
-    Dependency Collection
-
-  Stage: Stage-0
-    Move Operator
-      tables:
-          replace: false
-          table:
-              input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-              output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-              serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              name: default.varchar_3
-
-  Stage: Stage-3
-    Stats-Aggr Operator
-
-PREHOOK: query: insert into table varchar_3 select cint from alltypesorc limit 10
-PREHOOK: type: QUERY
-PREHOOK: Input: default@alltypesorc
-PREHOOK: Output: default@varchar_3
-POSTHOOK: query: insert into table varchar_3 select cint from alltypesorc limit 10
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@alltypesorc
-POSTHOOK: Output: default@varchar_3
-POSTHOOK: Lineage: varchar_3.field EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ]
-PREHOOK: query: drop table varchar_3
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@varchar_3
-PREHOOK: Output: default@varchar_3
-POSTHOOK: query: drop table varchar_3
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@varchar_3
-POSTHOOK: Output: default@varchar_3
+POSTHOOK: Input: default@char_2
+POSTHOOK: Output: default@char_2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out Mon Oct  6 03:44:13 2014
@@ -50,8 +50,6 @@ STAGE PLANS:
                         0 cint (type: int)
                         1 cint (type: int)
                       outputColumnNames: _col2, _col17
-                      input vertices:
-                        1 Map 1
                       Statistics: Num rows: 6758 Data size: 207479 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col2 (type: int), _col17 (type: int)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out Mon Oct  6 03:44:13 2014
@@ -33,8 +33,6 @@ STAGE PLANS:
                         0 _col0 (type: smallint)
                         1 csmallint (type: smallint)
                       outputColumnNames: _col1
-                      input vertices:
-                        0 Map 4
                       Statistics: Num rows: 6758 Data size: 207479 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col1 (type: double)
@@ -83,8 +81,6 @@ STAGE PLANS:
                         0 ctinyint (type: tinyint)
                         1 ctinyint (type: tinyint)
                       outputColumnNames: _col0, _col1, _col5, _col15
-                      input vertices:
-                        0 Map 3
                       Statistics: Num rows: 6758 Data size: 207479 Basic stats: COMPLETE Column stats: NONE
                       Filter Operator
                         predicate: (_col0 = _col15) (type: boolean)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out Mon Oct  6 03:44:13 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out?rev=1629562&r1=1629561&r2=1629562&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out Mon Oct  6 03:44:13 2014
@@ -48,7 +48,7 @@ STAGE PLANS:
             Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
-              Merge Join Operator
+              Join Operator
                 condition map:
                      Inner Join 0 to 1
                 condition expressions: