hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1468783 [13/16] - in /hive/branches/HIVE-4115: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/ beeline/src/test/org/apache/ beeline/src/test/org/apache/hive/ beeline/src/test/org/apache/hive/beeline/ beeline/src/test/org...
Date Wed, 17 Apr 2013 07:29:46 GMT
Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out Wed Apr 17 07:29:38 2013
@@ -55,7 +55,7 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 PREHOOK: query: SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_1
 PREHOOK: Input: default@dest_2
@@ -64,7 +64,7 @@ PREHOOK: Input: default@src1
 POSTHOOK: query: SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
@@ -77,22 +77,6 @@ POSTHOOK: Lineage: dest_1.value SIMPLE [
 POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 NULL	NULL	333444	555666	333444	555666
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -125,54 +109,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
 					
 					
 					
@@ -205,22 +141,38 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
 	val_265				
 	val_265				
 	val_265				
@@ -237,6 +189,54 @@ NULL	NULL	333444	555666	333444	555666
 	val_265				
 	val_265				
 	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
 128		128		128	
 146	val_146	146	val_146	146	val_146
 224		224		224	
@@ -245,13 +245,13 @@ PREHOOK: query: explain
 SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_1.key SIMPLE []
@@ -260,7 +260,7 @@ POSTHOOK: Lineage: dest_1.value SIMPLE [
 POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_RIGHTOUTERJOIN (TOK_TABREF (TOK_TABNAME src1)) (TOK_TABREF (TOK_TABNAME dest_1) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME dest_2) src3) (= (. (TOK_TABLE_OR_COL src2) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_HINTLIST (TOK_HINT TOK_MAPJOIN (TOK_HINTARGLIST src1 src2))) (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) key)))))
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_RIGHTOUTERJOIN (TOK_TABREF (TOK_TABNAME src1)) (TOK_TABREF (TOK_TABNAME dest_1) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME dest_2) src3) (= (. (TOK_TABLE_OR_COL src2) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_HINTLIST (TOK_HINT TOK_MAPJOIN (TOK_HINTARGLIST src1 src2))) (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) value)))))
 
 STAGE DEPENDENCIES:
   Stage-4 is a root stage
@@ -347,11 +347,17 @@ STAGE PLANS:
                   key expressions:
                         expr: _col0
                         type: string
+                        expr: _col1
+                        type: string
                         expr: _col2
                         type: string
+                        expr: _col3
+                        type: string
                         expr: _col4
                         type: string
-                  sort order: +++
+                        expr: _col5
+                        type: string
+                  sort order: ++++++
                   tag: -1
                   value expressions:
                         expr: _col0
@@ -385,7 +391,7 @@ STAGE PLANS:
 PREHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_1
 PREHOOK: Input: default@dest_2
@@ -394,7 +400,7 @@ PREHOOK: Input: default@src1
 POSTHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
@@ -411,30 +417,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -451,30 +433,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -490,30 +448,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -530,43 +464,115 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
 	val_165				
 	val_165				
 	val_165				
 	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
 	val_409				
 	val_409				
 	val_409				
-	val_409				
 	val_484				
 	val_484				
 	val_484				
 	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
 128		128		128	
 146	val_146	146	val_146	146	val_146
 224		224		224	
@@ -574,7 +580,7 @@ NULL	NULL	333444	555666	333444	555666
 PREHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src1.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_1
 PREHOOK: Input: default@dest_2
@@ -583,7 +589,7 @@ PREHOOK: Input: default@src1
 POSTHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src1.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
@@ -599,34 +605,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-					
-					
-					
-					
 					
 					
 					
@@ -639,34 +617,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-					
-					
-					
-					
 					
 					
 					
@@ -679,38 +629,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-					
-					
-					
-					
-					
-					
-					
-					
 					
 					
 					
@@ -719,30 +637,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -755,34 +649,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-128		128		128	
-146	val_146	146	val_146	146	val_146
-224		224		224	
-369		369		369	
-PREHOOK: query: SELECT * FROM src1
-  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
-  JOIN dest_2 src3 ON (src1.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@dest_1
-PREHOOK: Input: default@dest_2
-PREHOOK: Input: default@src1
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src1
-  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
-  JOIN dest_2 src3 ON (src1.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@dest_1
-POSTHOOK: Input: default@dest_2
-POSTHOOK: Input: default@src1
-#### A masked pattern was here ####
-POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: dest_1.key SIMPLE []
-POSTHOOK: Lineage: dest_1.value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: dest_1.value SIMPLE []
-POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
-POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 					
 					
 					
@@ -799,22 +665,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
 	val_165				
 	val_165				
 	val_165				
@@ -831,54 +681,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 	val_165				
 	val_165				
 	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
 	val_193				
 	val_193				
 	val_193				
@@ -895,6 +697,98 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 	val_193				
 	val_193				
 	val_193				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+128		128		128	
+146	val_146	146	val_146	146	val_146
+224		224		224	
+369		369		369	
+PREHOOK: query: SELECT * FROM src1
+  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
+  JOIN dest_2 src3 ON (src1.key = src3.key)
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest_1
+PREHOOK: Input: default@dest_2
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM src1
+  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
+  JOIN dest_2 src3 ON (src1.key = src3.key)
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest_1
+POSTHOOK: Input: default@dest_2
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
+POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: dest_1.key SIMPLE []
+POSTHOOK: Lineage: dest_1.value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: dest_1.value SIMPLE []
+POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
+POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 					
 					
 					
@@ -943,34 +837,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-128		128		128	
-146	val_146	146	val_146	146	val_146
-224		224		224	
-369		369		369	
-PREHOOK: query: SELECT * FROM src1
-  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
-  JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@dest_1
-PREHOOK: Input: default@dest_2
-PREHOOK: Input: default@src1
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM src1
-  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
-  JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@dest_1
-POSTHOOK: Input: default@dest_2
-POSTHOOK: Input: default@src1
-#### A masked pattern was here ####
-POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: dest_1.key SIMPLE []
-POSTHOOK: Lineage: dest_1.value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: dest_1.value SIMPLE []
-POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
-POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 					
 					
 					
@@ -987,22 +853,6 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_27				
 	val_165				
 	val_165				
 	val_165				
@@ -1019,6 +869,54 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 	val_165				
 	val_165				
 	val_165				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
 	val_409				
 	val_409				
 	val_409				
@@ -1051,38 +949,40 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 	val_484				
 	val_484				
 	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
+128		128		128	
+146	val_146	146	val_146	146	val_146
+224		224		224	
+369		369		369	
+PREHOOK: query: SELECT * FROM src1
+  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
+  JOIN dest_2 src3 ON (src2.key = src3.key)
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest_1
+PREHOOK: Input: default@dest_2
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT * FROM src1
+  LEFT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
+  JOIN dest_2 src3 ON (src2.key = src3.key)
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest_1
+POSTHOOK: Input: default@dest_2
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
+POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: dest_1.key SIMPLE []
+POSTHOOK: Lineage: dest_1.value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: dest_1.value SIMPLE []
+POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
+POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
+					
+					
+					
+					
+					
+					
 					
 					
 					
@@ -1131,6 +1031,112 @@ POSTHOOK: Lineage: dest_2.value SIMPLE [
 					
 					
 					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
 128		128		128	
 146	val_146	146	val_146	146	val_146
 224		224		224	
@@ -1139,13 +1145,13 @@ PREHOOK: query: explain
 SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
 SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: dest_1.key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_1.key SIMPLE []
@@ -1154,7 +1160,7 @@ POSTHOOK: Lineage: dest_1.value SIMPLE [
 POSTHOOK: Lineage: dest_2.key SIMPLE [(dest_1)dest_1.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: dest_2.value SIMPLE [(dest_1)dest_1.FieldSchema(name:value, type:string, comment:null), ]
 ABSTRACT SYNTAX TREE:
-  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_RIGHTOUTERJOIN (TOK_TABREF (TOK_TABNAME src1)) (TOK_TABREF (TOK_TABNAME dest_1) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME dest_2) src3) (= (. (TOK_TABLE_OR_COL src2) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) key)))))
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_RIGHTOUTERJOIN (TOK_TABREF (TOK_TABNAME src1)) (TOK_TABREF (TOK_TABNAME dest_1) src2) (= (. (TOK_TABLE_OR_COL src1) key) (. (TOK_TABLE_OR_COL src2) key))) (TOK_TABREF (TOK_TABNAME dest_2) src3) (= (. (TOK_TABLE_OR_COL src2) key) (. (TOK_TABLE_OR_COL src3) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src1) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src2) value)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) key)) (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL src3) value)))))
 
 STAGE DEPENDENCIES:
   Stage-6 is a root stage
@@ -1255,11 +1261,17 @@ STAGE PLANS:
               key expressions:
                     expr: _col0
                     type: string
+                    expr: _col1
+                    type: string
                     expr: _col2
                     type: string
+                    expr: _col3
+                    type: string
                     expr: _col4
                     type: string
-              sort order: +++
+                    expr: _col5
+                    type: string
+              sort order: ++++++
               tag: -1
               value expressions:
                     expr: _col0
@@ -1291,7 +1303,7 @@ STAGE PLANS:
 PREHOOK: query: SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_1
 PREHOOK: Input: default@dest_2
@@ -1300,7 +1312,7 @@ PREHOOK: Input: default@src1
 POSTHOOK: query: SELECT * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src2.key = src3.key)
-  SORT BY src1.key, src2.key, src3.key
+  SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
@@ -1317,30 +1329,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -1357,30 +1345,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -1396,30 +1360,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -1436,30 +1376,6 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
-	val_27				
-	val_27				
-	val_27				
-	val_27				
-	val_165				
-	val_165				
-	val_165				
-	val_165				
-	val_409				
-	val_409				
-	val_409				
-	val_409				
-	val_484				
-	val_484				
-	val_484				
-	val_484				
-	val_265				
-	val_265				
-	val_265				
-	val_265				
-	val_193				
-	val_193				
-	val_193				
-	val_193				
 					
 					
 					
@@ -1473,6 +1389,102 @@ NULL	NULL	333444	555666	333444	555666
 					
 					
 					
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_165				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_193				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_265				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_27				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_409				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
+	val_484				
 128		128		128	
 146	val_146	146	val_146	146	val_146
 224		224		224	

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

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_createas1.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_createas1.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_createas1.q.out Wed Apr 17 07:29:38 2013
@@ -199,11 +199,11 @@ STAGE PLANS:
               ListSink
 
 
-PREHOOK: query: SELECT * FROM orc_createas1b LIMIT 5
+PREHOOK: query: SELECT * FROM orc_createas1b ORDER BY key LIMIT 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_createas1b
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM orc_createas1b LIMIT 5
+POSTHOOK: query: SELECT * FROM orc_createas1b ORDER BY key LIMIT 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_createas1b
 #### A masked pattern was here ####
@@ -211,11 +211,11 @@ POSTHOOK: Lineage: orc_createas1a PARTIT
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orc_createas1a PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-238	val_238
-86	val_86
-311	val_311
-27	val_27
-165	val_165
+0	val_0
+0	val_0
+0	val_0
+10	val_10
+100	val_100
 PREHOOK: query: EXPLAIN
     CREATE TABLE orc_createas1c
     STORED AS ORC AS 

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_empty_strings.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_empty_strings.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_empty_strings.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_empty_strings.q.out Wed Apr 17 07:29:38 2013
@@ -53,13 +53,13 @@ POSTHOOK: Lineage: test_orc.key SIMPLE [
 POSTHOOK: Lineage: test_orc.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: -- Test reading a column which has some empty strings
 
-SELECT * FROM test_orc
+SELECT * FROM test_orc ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_orc
 #### A masked pattern was here ####
 POSTHOOK: query: -- Test reading a column which has some empty strings
 
-SELECT * FROM test_orc
+SELECT * FROM test_orc ORDER BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_orc
 #### A masked pattern was here ####
@@ -68,10 +68,10 @@ POSTHOOK: Lineage: test_orc.key EXPRESSI
 
 
 
-27
-165
 
-255
 
 
 
+165
+255
+27

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/partition_schema1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/partition_schema1.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/partition_schema1.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/partition_schema1.q.out Wed Apr 17 07:29:38 2013
@@ -19,8 +19,6 @@ POSTHOOK: query: desc partition_schema1 
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	None                
 value               	string              	None                
 dt                  	string              	None                
@@ -45,8 +43,6 @@ POSTHOOK: query: desc partition_schema1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	None                
 value               	string              	None                
 x                   	string              	None                
@@ -62,8 +58,6 @@ POSTHOOK: query: desc partition_schema1 
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-# col_name            	data_type           	comment             
-	 	 
 key                 	string              	None                
 value               	string              	None                
 dt                  	string              	None                

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd2.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd2.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd2.q.out Wed Apr 17 07:29:38 2013
@@ -31,7 +31,6 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -61,7 +60,9 @@ STAGE PLANS:
                   key expressions:
                         expr: _col0
                         type: string
-                  sort order: +
+                        expr: _col1
+                        type: bigint
+                  sort order: +-
                   Map-reduce partition columns:
                         expr: _col0
                         type: string
@@ -86,52 +87,23 @@ STAGE PLANS:
                   expr: _col1
                   type: bigint
             outputColumnNames: _col0, _col1
-            File Output Operator
-              compressed: false
-              GlobalTableId: 0
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-              sort order: +-
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-      Reduce Operator Tree:
-        Extract
-          Filter Operator
-            predicate:
-                expr: (_col1 > 1)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+            Filter Operator
+              predicate:
+                  expr: (_col1 > 1)
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: _col0
+                      type: string
+                      expr: _col1
+                      type: bigint
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator
@@ -522,7 +494,6 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -556,7 +527,9 @@ STAGE PLANS:
                     key expressions:
                           expr: _col0
                           type: string
-                    sort order: +
+                          expr: _col1
+                          type: bigint
+                    sort order: +-
                     Map-reduce partition columns:
                           expr: _col0
                           type: string
@@ -581,52 +554,23 @@ STAGE PLANS:
                   expr: _col1
                   type: bigint
             outputColumnNames: _col0, _col1
-            File Output Operator
-              compressed: false
-              GlobalTableId: 0
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-
-  Stage: Stage-2
-    Map Reduce
-      Alias -> Map Operator Tree:
-#### A masked pattern was here ####
-            Reduce Output Operator
-              key expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-              sort order: +-
-              Map-reduce partition columns:
-                    expr: _col0
-                    type: string
-              tag: -1
-              value expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-      Reduce Operator Tree:
-        Extract
-          Filter Operator
-            predicate:
-                expr: (_col1 > 1)
-                type: boolean
-            Select Operator
-              expressions:
-                    expr: _col0
-                    type: string
-                    expr: _col1
-                    type: bigint
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                GlobalTableId: 0
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+            Filter Operator
+              predicate:
+                  expr: (_col1 > 1)
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: _col0
+                      type: string
+                      expr: _col1
+                      type: bigint
+                outputColumnNames: _col0, _col1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 0
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd_union_view.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ppd_union_view.q.out Wed Apr 17 07:29:38 2013
@@ -145,7 +145,6 @@ on t1_old.keymap = t1_mapping.keymap and
    t1_old.ds = t1_mapping.ds
 ) subq
 PREHOOK: type: CREATEVIEW
-#### A masked pattern was here ####
 POSTHOOK: query: create view t1 partitioned on (ds) as
 select * from
 (
@@ -157,7 +156,6 @@ on t1_old.keymap = t1_mapping.keymap and
 ) subq
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@t1
-#### A masked pattern was here ####
 POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-13).key SIMPLE []
 POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-13).keymap SIMPLE []
 POSTHOOK: Lineage: t1_mapping PARTITION(ds=2011-10-14).key SIMPLE []

Modified: hive/branches/HIVE-4115/ql/src/test/results/clientpositive/protectmode.q.out
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ql/src/test/results/clientpositive/protectmode.q.out?rev=1468783&r1=1468782&r2=1468783&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ql/src/test/results/clientpositive/protectmode.q.out (original)
+++ hive/branches/HIVE-4115/ql/src/test/results/clientpositive/protectmode.q.out Wed Apr 17 07:29:38 2013
@@ -43,8 +43,6 @@ PREHOOK: query: desc extended tbl1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 	 	 
 #### A masked pattern was here ####
@@ -60,8 +58,6 @@ PREHOOK: query: desc extended tbl1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl1
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 	 	 
 #### A masked pattern was here ####
@@ -146,8 +142,6 @@ PREHOOK: query: desc extended tbl2 parti
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2 partition (p='p1')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 
@@ -169,8 +163,6 @@ PREHOOK: query: desc extended tbl2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 
@@ -192,8 +184,6 @@ PREHOOK: query: desc extended tbl2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 
@@ -223,8 +213,6 @@ PREHOOK: query: desc extended tbl2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 
@@ -246,8 +234,6 @@ PREHOOK: query: desc extended tbl2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 
@@ -290,8 +276,6 @@ PREHOOK: query: desc extended tbl2 parti
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl2 partition (p='p1')
 POSTHOOK: type: DESCTABLE
-# col_name            	data_type           	comment             
-	 	 
 col                 	string              	None                
 p                   	string              	None                
 	 	 

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



Mime
View raw message