You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/05/30 19:37:15 UTC

svn commit: r1598678 [6/31] - in /hive/trunk: cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/io/ itests/util/src/main/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/...

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_varchar1.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: drop table alter_varchar_1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table alter_varchar_1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table alter_varchar_1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table alter_varchar_1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table alter_varchar_1 (key string, value string)
 PREHOOK: type: CREATETABLE
@@ -21,11 +25,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@alter_varchar_1
 POSTHOOK: Lineage: alter_varchar_1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_varchar_1 order by key
+PREHOOK: query: select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1 order by key
+POSTHOOK: query: select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
@@ -45,12 +49,12 @@ POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@alter_varchar_1
 POSTHOOK: Output: default@alter_varchar_1
 PREHOOK: query: -- contents should still look the same
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- contents should still look the same
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
@@ -70,12 +74,12 @@ POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@alter_varchar_1
 POSTHOOK: Output: default@alter_varchar_1
 PREHOOK: query: -- value column should be truncated now
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- value column should be truncated now
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
@@ -95,12 +99,12 @@ POSTHOOK: type: ALTERTABLE_RENAMECOL
 POSTHOOK: Input: default@alter_varchar_1
 POSTHOOK: Output: default@alter_varchar_1
 PREHOOK: query: -- column values should be full size again
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
 POSTHOOK: query: -- column values should be full size again
-select * from alter_varchar_1 order by key
+select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
@@ -119,11 +123,11 @@ alter table alter_varchar_1 add columns 
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@alter_varchar_1
 POSTHOOK: Output: default@alter_varchar_1
-PREHOOK: query: select * from alter_varchar_1 order by key
+PREHOOK: query: select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1 order by key
+POSTHOOK: query: select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
@@ -146,11 +150,11 @@ POSTHOOK: Lineage: alter_varchar_1.key S
 POSTHOOK: Lineage: alter_varchar_1.key2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: alter_varchar_1.value2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select * from alter_varchar_1 order by key
+PREHOOK: query: select * from alter_varchar_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from alter_varchar_1 order by key
+POSTHOOK: query: select * from alter_varchar_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alter_varchar_1
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT)
+PREHOOK: query: --SORT_QUERY_RESULTS
+
+CREATE TABLE dest_j1(key INT, cnt INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE dest_j1(key INT, cnt INT)
+POSTHOOK: query: --SORT_QUERY_RESULTS
+
+CREATE TABLE dest_j1(key INT, cnt INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest_j1
@@ -121,16 +125,14 @@ POSTHOOK: Input: default@src1
 POSTHOOK: Output: default@dest_j1
 POSTHOOK: Lineage: dest_j1.cnt EXPRESSION [(src1)x.null, (src)y.null, ]
 POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src1)x.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: select * from dest_j1 x order by x.key
+PREHOOK: query: select * from dest_j1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest_j1 x order by x.key
+POSTHOOK: query: select * from dest_j1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
 #### A masked pattern was here ####
-66	1
-98	2
 128	3
 146	2
 150	1
@@ -144,3 +146,5 @@ POSTHOOK: Input: default@dest_j1
 369	3
 401	5
 406	4
+66	1
+98	2

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tbl1
@@ -258,7 +262,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 POSTHOOK: query: -- A join is being performed across different sub-queries, where a join is being performed in each of them.
 -- Each sub-query should be converted to a sort-merge join.
@@ -278,14 +281,12 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-3 depends on stages: Stage-1, Stage-5
-  Stage-4 depends on stages: Stage-3
-  Stage-5 is a root stage
-  Stage-0 depends on stages: Stage-4
+  Stage-3 depends on stages: Stage-1, Stage-4
+  Stage-4 is a root stage
+  Stage-0 depends on stages: Stage-3
 
 STAGE PLANS:
   Stage: Stage-1
@@ -362,31 +363,14 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  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-4
     Map Reduce
       Map Operator Tree:
           TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-              sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-      Reduce Operator Tree:
-        Extract
-          File Output Operator
-            compressed: false
-            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-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
@@ -449,7 +433,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tbl1
 PREHOOK: Input: default@tbl2
@@ -469,7 +452,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tbl1
 POSTHOOK: Input: default@tbl2
@@ -1573,11 +1555,11 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(
 POSTHOOK: Lineage: dest2.key SIMPLE [(tbl1)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest2.val1 SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: dest2.val2 SIMPLE [(tbl2)b.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: select * from dest1 order by key, value
+PREHOOK: query: select * from dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest1 order by key, value
+POSTHOOK: query: select * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -1603,11 +1585,11 @@ POSTHOOK: Input: default@dest1
 5	val_5
 8	val_8
 9	val_9
-PREHOOK: query: select * from dest2 order by key, val1, val2
+PREHOOK: query: select * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest2 order by key, val1, val2
+POSTHOOK: query: select * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
@@ -1827,11 +1809,11 @@ POSTHOOK: Lineage: dest1.key SIMPLE [(tb
 POSTHOOK: Lineage: dest1.value SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: dest2.cnt EXPRESSION [(tbl1)a.null, (tbl2)b.null, ]
 POSTHOOK: Lineage: dest2.key SIMPLE [(tbl1)a.FieldSchema(name:key, type:int, comment:null), ]
-PREHOOK: query: select * from dest1 order by key, value
+PREHOOK: query: select * from dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest1 order by key, value
+POSTHOOK: query: select * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -1857,11 +1839,11 @@ POSTHOOK: Input: default@dest1
 5	val_5
 8	val_8
 9	val_9
-PREHOOK: query: select * from dest2 order by key
+PREHOOK: query: select * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest2 order by key
+POSTHOOK: query: select * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tbl1
@@ -164,11 +168,11 @@ POSTHOOK: Lineage: dest1.k1 SIMPLE [(tbl
 POSTHOOK: Lineage: dest1.k2 SIMPLE [(tbl2)b.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest2.k1 SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: dest2.k2 SIMPLE [(tbl2)b.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: select * from dest1 order by k1, k2
+PREHOOK: query: select * from dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest1 order by k1, k2
+POSTHOOK: query: select * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -194,11 +198,11 @@ POSTHOOK: Input: default@dest1
 5	5
 8	8
 9	9
-PREHOOK: query: select * from dest2 order by k1, k2
+PREHOOK: query: select * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest2 order by k1, k2
+POSTHOOK: query: select * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
@@ -342,11 +346,11 @@ POSTHOOK: Lineage: dest1.k1 SIMPLE [(tbl
 POSTHOOK: Lineage: dest1.k2 SIMPLE [(tbl2)b.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest2.k1 SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: dest2.k2 SIMPLE [(tbl2)b.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: select * from dest1 order by k1, k2
+PREHOOK: query: select * from dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest1 order by k1, k2
+POSTHOOK: query: select * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -372,11 +376,11 @@ POSTHOOK: Input: default@dest1
 5	5
 8	8
 9	9
-PREHOOK: query: select * from dest2 order by k1, k2
+PREHOOK: query: select * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest2 order by k1, k2
+POSTHOOK: query: select * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####
@@ -520,11 +524,11 @@ POSTHOOK: Lineage: dest1.k1 SIMPLE [(tbl
 POSTHOOK: Lineage: dest1.k2 SIMPLE [(tbl2)b.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest2.k1 SIMPLE [(tbl1)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: dest2.k2 SIMPLE [(tbl2)b.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: select * from dest1 order by k1, k2
+PREHOOK: query: select * from dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest1 order by k1, k2
+POSTHOOK: query: select * from dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -550,11 +554,11 @@ POSTHOOK: Input: default@dest1
 5	5
 8	8
 9	9
-PREHOOK: query: select * from dest2 order by k1, k2
+PREHOOK: query: select * from dest2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest2
 #### A masked pattern was here ####
-POSTHOOK: query: select * from dest2 order by k1, k2
+POSTHOOK: query: select * from dest2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest2
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out Fri May 30 17:37:05 2014
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tbl1
@@ -113,29 +117,24 @@ POSTHOOK: Input: default@tbl2
 #### A masked pattern was here ####
 22
 PREHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join
--- Add a order by at the end to make the results deterministic.
 explain
 select key, count(*) from 
 (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 PREHOOK: type: QUERY
 POSTHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join
--- Add a order by at the end to make the results deterministic.
 explain
 select key, count(*) from 
 (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 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-0 depends on stages: Stage-1
 
 STAGE PLANS:
   Stage: Stage-1
@@ -179,26 +178,9 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: int)
-              sort order: +
-              value expressions: _col0 (type: int), _col1 (type: bigint)
-      Reduce Operator Tree:
-        Extract
-          File Output Operator
-            compressed: false
-            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
+                  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
@@ -211,7 +193,6 @@ PREHOOK: query: select key, count(*) fro
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tbl1
 PREHOOK: Input: default@tbl2
@@ -221,7 +202,6 @@ POSTHOOK: query: select key, count(*) fr
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tbl1
 POSTHOOK: Input: default@tbl2
@@ -378,7 +358,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 POSTHOOK: query: -- A join is being performed across different sub-queries, where a join is being performed in each of them.
 -- Each sub-query should be converted to a sort-merge join.
@@ -398,19 +377,17 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, Stage-11, Stage-3
+  Stage-8 depends on stages: Stage-1, Stage-4 , consists of Stage-9, Stage-10, Stage-3
+  Stage-9 has a backup stage: Stage-3
+  Stage-6 depends on stages: Stage-9
   Stage-10 has a backup stage: Stage-3
   Stage-7 depends on stages: Stage-10
-  Stage-4 depends on stages: Stage-3, Stage-7, Stage-8
-  Stage-11 has a backup stage: Stage-3
-  Stage-8 depends on stages: Stage-11
   Stage-3
-  Stage-5 is a root stage
-  Stage-0 depends on stages: Stage-4
+  Stage-4 is a root stage
+  Stage-0 depends on stages: Stage-6, Stage-7, Stage-3
 
 STAGE PLANS:
   Stage: Stage-1
@@ -458,10 +435,10 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-9
+  Stage: Stage-8
     Conditional Operator
 
-  Stage: Stage-10
+  Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
         $INTNAME1 
@@ -478,7 +455,7 @@ STAGE PLANS:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
 
-  Stage: Stage-7
+  Stage: Stage-6
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -498,30 +475,13 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
 
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-              sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-      Reduce Operator Tree:
-        Extract
-          File Output Operator
-            compressed: false
-            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-11
+  Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
         $INTNAME 
@@ -538,7 +498,7 @@ STAGE PLANS:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
 
-  Stage: Stage-8
+  Stage: Stage-7
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -558,9 +518,9 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
 
@@ -593,11 +553,11 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  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-5
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -663,7 +623,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tbl1
 PREHOOK: Input: default@tbl2
@@ -683,7 +642,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tbl1
 POSTHOOK: Input: default@tbl2
@@ -1848,40 +1806,35 @@ POSTHOOK: Input: default@tbl2
 #### A masked pattern was here ####
 22
 PREHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join
--- Add a order by at the end to make the results deterministic.
 explain
 select key, count(*) from 
 (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 PREHOOK: type: QUERY
 POSTHOOK: query: -- The join is being performed as part of sub-query. It should be converted to a sort-merge join
--- Add a order by at the end to make the results deterministic.
 explain
 select key, count(*) from 
 (
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-6 is a root stage , consists of Stage-7, Stage-8, Stage-1
+  Stage-5 is a root stage , consists of Stage-6, Stage-7, Stage-1
+  Stage-6 has a backup stage: Stage-1
+  Stage-3 depends on stages: Stage-6
   Stage-7 has a backup stage: Stage-1
   Stage-4 depends on stages: Stage-7
-  Stage-2 depends on stages: Stage-1, Stage-4, Stage-5
-  Stage-8 has a backup stage: Stage-1
-  Stage-5 depends on stages: Stage-8
   Stage-1
-  Stage-0 depends on stages: Stage-2
+  Stage-0 depends on stages: Stage-3, Stage-4, Stage-1
 
 STAGE PLANS:
-  Stage: Stage-6
+  Stage: Stage-5
     Conditional Operator
 
-  Stage: Stage-7
+  Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
         subq1:b 
@@ -1899,7 +1852,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-4
+  Stage: Stage-3
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -1941,28 +1894,11 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: int)
-              sort order: +
-              value expressions: _col0 (type: int), _col1 (type: bigint)
-      Reduce Operator Tree:
-        Extract
-          File Output Operator
-            compressed: false
-            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
+                  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-8
+  Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
         subq1:a 
@@ -1980,7 +1916,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-5
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2022,9 +1958,9 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  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-1
     Map Reduce
@@ -2067,9 +2003,9 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  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
@@ -2082,7 +2018,6 @@ PREHOOK: query: select key, count(*) fro
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tbl1
 PREHOOK: Input: default@tbl2
@@ -2092,7 +2027,6 @@ POSTHOOK: query: select key, count(*) fr
   select a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
 ) subq1
 group by key
-order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tbl1
 POSTHOOK: Input: default@tbl2
@@ -2389,7 +2323,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 POSTHOOK: query: -- A join is being performed across different sub-queries, where a join is being performed in each of them.
 -- Each sub-query should be converted to a sort-merge join.
@@ -2409,35 +2342,33 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-12 is a root stage , consists of Stage-18, Stage-19, Stage-1
-  Stage-18 has a backup stage: Stage-1
-  Stage-10 depends on stages: Stage-18
-  Stage-9 depends on stages: Stage-1, Stage-5, Stage-10, Stage-11, Stage-13, Stage-14 , consists of Stage-16, Stage-17, Stage-3
+  Stage-11 is a root stage , consists of Stage-17, Stage-18, Stage-1
+  Stage-17 has a backup stage: Stage-1
+  Stage-9 depends on stages: Stage-17
+  Stage-8 depends on stages: Stage-1, Stage-4, Stage-9, Stage-10, Stage-12, Stage-13 , consists of Stage-15, Stage-16, Stage-3
+  Stage-15 has a backup stage: Stage-3
+  Stage-6 depends on stages: Stage-15
   Stage-16 has a backup stage: Stage-3
   Stage-7 depends on stages: Stage-16
-  Stage-4 depends on stages: Stage-3, Stage-7, Stage-8
-  Stage-17 has a backup stage: Stage-3
-  Stage-8 depends on stages: Stage-17
   Stage-3
-  Stage-19 has a backup stage: Stage-1
-  Stage-11 depends on stages: Stage-19
+  Stage-18 has a backup stage: Stage-1
+  Stage-10 depends on stages: Stage-18
   Stage-1
-  Stage-15 is a root stage , consists of Stage-20, Stage-21, Stage-5
-  Stage-20 has a backup stage: Stage-5
+  Stage-14 is a root stage , consists of Stage-19, Stage-20, Stage-4
+  Stage-19 has a backup stage: Stage-4
+  Stage-12 depends on stages: Stage-19
+  Stage-20 has a backup stage: Stage-4
   Stage-13 depends on stages: Stage-20
-  Stage-21 has a backup stage: Stage-5
-  Stage-14 depends on stages: Stage-21
-  Stage-5
-  Stage-0 depends on stages: Stage-4
+  Stage-4
+  Stage-0 depends on stages: Stage-6, Stage-7, Stage-3
 
 STAGE PLANS:
-  Stage: Stage-12
+  Stage: Stage-11
     Conditional Operator
 
-  Stage: Stage-18
+  Stage: Stage-17
     Map Reduce Local Work
       Alias -> Map Local Tables:
         src1:subq1:b 
@@ -2455,7 +2386,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-10
+  Stage: Stage-9
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2501,10 +2432,10 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-9
+  Stage: Stage-8
     Conditional Operator
 
-  Stage: Stage-16
+  Stage: Stage-15
     Map Reduce Local Work
       Alias -> Map Local Tables:
         $INTNAME1 
@@ -2521,7 +2452,7 @@ STAGE PLANS:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
 
-  Stage: Stage-7
+  Stage: Stage-6
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2541,30 +2472,13 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
 
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-              sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
-      Reduce Operator Tree:
-        Extract
-          File Output Operator
-            compressed: false
-            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-17
+  Stage: Stage-16
     Map Reduce Local Work
       Alias -> Map Local Tables:
         $INTNAME 
@@ -2581,7 +2495,7 @@ STAGE PLANS:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
 
-  Stage: Stage-8
+  Stage: Stage-7
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2601,9 +2515,9 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
 
@@ -2636,11 +2550,11 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+                  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-19
+  Stage: Stage-18
     Map Reduce Local Work
       Alias -> Map Local Tables:
         src1:subq1:a 
@@ -2658,7 +2572,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-11
+  Stage: Stage-10
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2749,10 +2663,10 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-15
+  Stage: Stage-14
     Conditional Operator
 
-  Stage: Stage-20
+  Stage: Stage-19
     Map Reduce Local Work
       Alias -> Map Local Tables:
         src2:subq2:b 
@@ -2770,7 +2684,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-13
+  Stage: Stage-12
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2816,7 +2730,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-21
+  Stage: Stage-20
     Map Reduce Local Work
       Alias -> Map Local Tables:
         src2:subq2:a 
@@ -2834,7 +2748,7 @@ STAGE PLANS:
                 0 key (type: int)
                 1 key (type: int)
 
-  Stage: Stage-14
+  Stage: Stage-13
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2880,7 +2794,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-5
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -2946,7 +2860,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tbl1
 PREHOOK: Input: default@tbl2
@@ -2966,7 +2879,6 @@ join
   ) subq2 group by key
 ) src2
 on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tbl1
 POSTHOOK: Input: default@tbl2

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out Fri May 30 17:37:05 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- verify that new fields in schema get propagated to table scans
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that new fields in schema get propagated to table scans
 CREATE TABLE doctors_with_new_field 
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -35,7 +37,9 @@ TBLPROPERTIES ('avro.schema.literal'='{
 }')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: -- verify that new fields in schema get propagated to table scans
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that new fields in schema get propagated to table scans
 CREATE TABLE doctors_with_new_field 
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -91,22 +95,22 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@doctors_with_new_field
-PREHOOK: query: SELECT * FROM doctors_with_new_field ORDER BY first_name
+PREHOOK: query: SELECT * FROM doctors_with_new_field
 PREHOOK: type: QUERY
 PREHOOK: Input: default@doctors_with_new_field
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM doctors_with_new_field ORDER BY first_name
+POSTHOOK: query: SELECT * FROM doctors_with_new_field
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@doctors_with_new_field
 #### A masked pattern was here ####
-9	Christopher	Eccleston	fishfingers and custard
-6	Colin	Baker	fishfingers and custard
+1	William	Hartnell	fishfingers and custard
 10	David	Tennant	fishfingers and custard
-3	Jon	Pertwee	fishfingers and custard
 11	Matt	Smith	fishfingers and custard
 2	Patrick	Troughton	fishfingers and custard
-8	Paul	McGann	fishfingers and custard
+3	Jon	Pertwee	fishfingers and custard
+4	Tom	Baker	fishfingers and custard
 5	Peter	Davison	fishfingers and custard
+6	Colin	Baker	fishfingers and custard
 7	Sylvester	McCoy	fishfingers and custard
-4	Tom	Baker	fishfingers and custard
-1	William	Hartnell	fishfingers and custard
+8	Paul	McGann	fishfingers and custard
+9	Christopher	Eccleston	fishfingers and custard

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out Fri May 30 17:37:05 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that new joins bring in correct schemas (including evolved schemas)
 
 CREATE TABLE doctors4
 ROW FORMAT
@@ -36,7 +38,9 @@ TBLPROPERTIES ('avro.schema.literal'='{
 }')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: -- verify that new joins bring in correct schemas (including evolved schemas)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that new joins bring in correct schemas (including evolved schemas)
 
 CREATE TABLE doctors4
 ROW FORMAT
@@ -173,23 +177,21 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@episodes
 PREHOOK: query: SELECT e.title, e.air_date, d.first_name, d.last_name, d.extra_field, e.air_date
 FROM doctors4 d JOIN episodes e ON (d.number=e.doctor)
-ORDER BY d.last_name, e.title
 PREHOOK: type: QUERY
 PREHOOK: Input: default@doctors4
 PREHOOK: Input: default@episodes
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT e.title, e.air_date, d.first_name, d.last_name, d.extra_field, e.air_date
 FROM doctors4 d JOIN episodes e ON (d.number=e.doctor)
-ORDER BY d.last_name, e.title
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@doctors4
 POSTHOOK: Input: default@episodes
 #### A masked pattern was here ####
-Horror of Fang Rock	3 September 1977	Tom	Baker	fishfingers and custard	3 September 1977
-The Mysterious Planet	6 September 1986	Colin	Baker	fishfingers and custard	6 September 1986
+An Unearthly Child	23 November 1963	William	Hartnell	fishfingers and custard	23 November 1963
 Castrolava	4 January 1982	Peter	Davison	fishfingers and custard	4 January 1982
+Horror of Fang Rock	3 September 1977	Tom	Baker	fishfingers and custard	3 September 1977
 Rose	26 March 2005	Christopher	Eccleston	fishfingers and custard	26 March 2005
-An Unearthly Child	23 November 1963	William	Hartnell	fishfingers and custard	23 November 1963
 The Doctor's Wife	14 May 2011	Matt	Smith	fishfingers and custard	14 May 2011
 The Eleventh Hour	3 April 2010	Matt	Smith	fishfingers and custard	3 April 2010
+The Mysterious Planet	6 September 1986	Colin	Baker	fishfingers and custard	6 September 1986
 The Power of the Daleks	5 November 1966	Patrick	Troughton	fishfingers and custard	5 November 1966

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_partitioned.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_partitioned.q.out Fri May 30 17:37:05 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- Verify that table scans work with partitioned Avro tables
+PREHOOK: query: -- SORT_QUERY_RESULTS
+-- Verify that table scans work with partitioned Avro tables
 CREATE TABLE episodes
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -29,7 +30,8 @@ TBLPROPERTIES ('avro.schema.literal'='{
 }')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: -- Verify that table scans work with partitioned Avro tables
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+-- Verify that table scans work with partitioned Avro tables
 CREATE TABLE episodes
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -167,20 +169,20 @@ POSTHOOK: Lineage: episodes_partitioned 
 POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
 POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
 POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-PREHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6 ORDER BY air_date
+PREHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@episodes_partitioned
 PREHOOK: Input: default@episodes_partitioned@doctor_pt=11
 PREHOOK: Input: default@episodes_partitioned@doctor_pt=9
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6 ORDER BY air_date
+POSTHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@episodes_partitioned
 POSTHOOK: Input: default@episodes_partitioned@doctor_pt=11
 POSTHOOK: Input: default@episodes_partitioned@doctor_pt=9
 #### A masked pattern was here ####
-The Doctor's Wife	14 May 2011	11	11
 Rose	26 March 2005	9	9
+The Doctor's Wife	14 May 2011	11	11
 The Eleventh Hour	3 April 2010	11	11
 PREHOOK: query: -- Verify that Fetch works in addition to Map
 SELECT * FROM episodes_partitioned ORDER BY air_date LIMIT 5
@@ -206,11 +208,11 @@ POSTHOOK: Input: default@episodes_partit
 POSTHOOK: Input: default@episodes_partitioned@doctor_pt=6
 POSTHOOK: Input: default@episodes_partitioned@doctor_pt=9
 #### A masked pattern was here ####
-The Doctor's Wife	14 May 2011	11	11
 An Unearthly Child	23 November 1963	1	1
+Horror of Fang Rock	3 September 1977	4	4
 Rose	26 March 2005	9	9
+The Doctor's Wife	14 May 2011	11	11
 The Eleventh Hour	3 April 2010	11	11
-Horror of Fang Rock	3 September 1977	4	4
 PREHOOK: query: -- Fetch w/filter to specific partition
 SELECT * FROM episodes_partitioned WHERE doctor_pt = 6
 PREHOOK: type: QUERY
@@ -409,7 +411,7 @@ POSTHOOK: type: ALTERTABLE_SERIALIZER
 POSTHOOK: Input: default@episodes_partitioned_serdeproperties
 POSTHOOK: Output: default@episodes_partitioned_serdeproperties
 PREHOOK: query: -- Try selecting from the evolved table
-SELECT * FROM episodes_partitioned_serdeproperties ORDER BY air_date
+SELECT * FROM episodes_partitioned_serdeproperties
 PREHOOK: type: QUERY
 PREHOOK: Input: default@episodes_partitioned_serdeproperties
 PREHOOK: Input: default@episodes_partitioned_serdeproperties@doctor_pt=1
@@ -421,7 +423,7 @@ PREHOOK: Input: default@episodes_partiti
 PREHOOK: Input: default@episodes_partitioned_serdeproperties@doctor_pt=9
 #### A masked pattern was here ####
 POSTHOOK: query: -- Try selecting from the evolved table
-SELECT * FROM episodes_partitioned_serdeproperties ORDER BY air_date
+SELECT * FROM episodes_partitioned_serdeproperties
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@episodes_partitioned_serdeproperties
 POSTHOOK: Input: default@episodes_partitioned_serdeproperties@doctor_pt=1
@@ -432,11 +434,11 @@ POSTHOOK: Input: default@episodes_partit
 POSTHOOK: Input: default@episodes_partitioned_serdeproperties@doctor_pt=6
 POSTHOOK: Input: default@episodes_partitioned_serdeproperties@doctor_pt=9
 #### A masked pattern was here ####
-[]	The Doctor's Wife	14 May 2011	11	11
 []	An Unearthly Child	23 November 1963	1	1
+[]	Castrolava	4 January 1982	5	5
+[]	Horror of Fang Rock	3 September 1977	4	4
 []	Rose	26 March 2005	9	9
+[]	The Doctor's Wife	14 May 2011	11	11
 []	The Eleventh Hour	3 April 2010	11	11
-[]	Horror of Fang Rock	3 September 1977	4	4
-[]	Castrolava	4 January 1982	5	5
-[]	The Power of the Daleks	5 November 1966	2	2
 []	The Mysterious Planet	6 September 1986	6	6
+[]	The Power of the Daleks	5 November 1966	2	2

Modified: hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out Fri May 30 17:37:05 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- verify that we can actually read avro files
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that we can actually read avro files
 CREATE TABLE doctors 
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -29,7 +31,9 @@ TBLPROPERTIES ('avro.schema.literal'='{
 }')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-POSTHOOK: query: -- verify that we can actually read avro files
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- verify that we can actually read avro files
 CREATE TABLE doctors 
 ROW FORMAT
 SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
@@ -78,15 +82,17 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@doctors
-PREHOOK: query: SELECT * FROM doctors ORDER BY number
+PREHOOK: query: SELECT * FROM doctors
 PREHOOK: type: QUERY
 PREHOOK: Input: default@doctors
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM doctors ORDER BY number
+POSTHOOK: query: SELECT * FROM doctors
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@doctors
 #### A masked pattern was here ####
 1	William	Hartnell
+10	David	Tennant
+11	Matt	Smith
 2	Patrick	Troughton
 3	Jon	Pertwee
 4	Tom	Baker
@@ -95,5 +101,3 @@ POSTHOOK: Input: default@doctors
 7	Sylvester	McCoy
 8	Paul	McGann
 9	Christopher	Eccleston
-10	David	Tennant
-11	Matt	Smith

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: drop table ba_test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table ba_test
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table ba_test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table ba_test
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: -- This query tests a) binary type works correctly in grammar b) string can be cast into binary c) binary can be stored in a table d) binary data can be loaded back again and queried d) order-by on a binary key 
 
@@ -33,24 +37,24 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@ba_test
 POSTHOOK: Lineage: ba_test.ba_key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: ba_test.ba_val EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select ba_key,ba_val from ba_test order by ba_key limit 10
+PREHOOK: query: select * from ba_test tablesample (10 rows)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@ba_test
 #### A masked pattern was here ####
-POSTHOOK: query: select ba_key,ba_val from ba_test order by ba_key limit 10
+POSTHOOK: query: select * from ba_test tablesample (10 rows)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@ba_test
 #### A masked pattern was here ####
-0	val_0
-0	val_0
-0	val_0
-10	val_10
-100	val_100
-100	val_100
-103	val_103
-103	val_103
-104	val_104
-104	val_104
+165	val_165
+238	val_238
+255	val_255
+27	val_27
+278	val_278
+311	val_311
+409	val_409
+484	val_484
+86	val_86
+98	val_98
 PREHOOK: query: drop table ba_test
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@ba_test

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: drop table ba_test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table ba_test
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table ba_test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table ba_test
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: -- All the test in ba_test1.q + using LazyBinarySerde instead of LazySimpleSerde
 
@@ -41,24 +45,24 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@ba_test
 POSTHOOK: Lineage: ba_test.ba_key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: ba_test.ba_val EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select ba_key, ba_val from ba_test order by ba_val limit 10
+PREHOOK: query: select * from ba_test tablesample (10 rows)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@ba_test
 #### A masked pattern was here ####
-POSTHOOK: query: select ba_key, ba_val from ba_test order by ba_val limit 10
+POSTHOOK: query: select * from ba_test tablesample (10 rows)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@ba_test
 #### A masked pattern was here ####
-0	val_0
-0	val_0
-0	val_0
-10	val_10
-100	val_100
-100	val_100
-103	val_103
-103	val_103
-104	val_104
-104	val_104
+165	val_165
+238	val_238
+255	val_255
+27	val_27
+278	val_278
+311	val_311
+409	val_409
+484	val_484
+86	val_86
+98	val_98
 PREHOOK: query: drop table ba_test
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@ba_test

Modified: hive/trunk/ql/src/test/results/clientpositive/ba_table_udfs.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ba_table_udfs.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ba_table_udfs.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ba_table_udfs.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: USE default
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+USE default
 PREHOOK: type: SWITCHDATABASE
-POSTHOOK: query: USE default
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+USE default
 POSTHOOK: type: SWITCHDATABASE
 PREHOOK: query: CREATE TABLE dest1(bytes1 BINARY,
                    bytes2 BINARY,
@@ -67,7 +71,6 @@ SELECT
   HEX(ENCODE(string, 'US-ASCII')),
   DECODE(ENCODE(string, 'US-ASCII'), 'US-ASCII')
 FROM dest1
-ORDER BY bytes2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
@@ -89,11 +92,9 @@ SELECT
   HEX(ENCODE(string, 'US-ASCII')),
   DECODE(ENCODE(string, 'US-ASCII'), 'US-ASCII')
 FROM dest1
-ORDER BY bytes2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 0	val_0	val_0	1	0val_0	val_	l_0	al_	30	0	MA==	0	76616C5F30	val_0
 0	val_0	val_0	1	0val_0	val_	l_0	al_	30	0	MA==	0	76616C5F30	val_0
 0	val_0	val_0	1	0val_0	val_	l_0	al_	30	0	MA==	0	76616C5F30	val_0
@@ -194,3 +195,4 @@ NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	
 187	val_187	val_187	3	187val_187	val_	l_187	_18	313837	187	MTg3	187	76616C5F313837	val_187
 187	val_187	val_187	3	187val_187	val_	l_187	_18	313837	187	MTg3	187	76616C5F313837	val_187
 187	val_187	val_187	3	187val_187	val_	l_187	_18	313837	187	MTg3	187	76616C5F313837	val_187
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/bucket1.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/bucket1.q.out Fri May 30 17:37:05 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out Fri May 30 17:37:05 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out Fri May 30 17:37:05 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/char_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/char_1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/char_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/char_1.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: drop table char1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table char1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table char1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table char1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: drop table char1_1
 PREHOOK: type: DROPTABLE
@@ -54,11 +58,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@char1
 POSTHOOK: Lineage: char1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: char1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select key, value from char1 order by key, value
+PREHOOK: query: select key, value from char1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char1
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from char1 order by key, value
+POSTHOOK: query: select key, value from char1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char1
 #### A masked pattern was here ####
@@ -78,11 +82,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@char1
 POSTHOOK: Lineage: char1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: char1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select key, value from char1 order by key, value
+PREHOOK: query: select key, value from char1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char1
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from char1 order by key, value
+POSTHOOK: query: select key, value from char1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char1
 #### A masked pattern was here ####
@@ -102,11 +106,11 @@ POSTHOOK: Input: default@char1
 POSTHOOK: Output: default@char1_1
 POSTHOOK: Lineage: char1_1.key SIMPLE [(char1)char1.FieldSchema(name:key, type:char(10), comment:null), ]
 POSTHOOK: Lineage: char1_1.value SIMPLE [(char1)char1.FieldSchema(name:value, type:char(20), comment:null), ]
-PREHOOK: query: select key, value from char1_1 order by key, value
+PREHOOK: query: select key, value from char1_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char1_1
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from char1_1 order by key, value
+POSTHOOK: query: select key, value from char1_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char1_1
 #### A masked pattern was here ####
@@ -126,11 +130,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@char1
 POSTHOOK: Lineage: char1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: char1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select key, value from char1 order by key, value
+PREHOOK: query: select key, value from char1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char1
 #### A masked pattern was here ####
-POSTHOOK: query: select key, value from char1 order by key, value
+POSTHOOK: query: select key, value from char1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char1
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/char_join1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/char_join1.q.out?rev=1598678&r1=1598677&r2=1598678&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/char_join1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/char_join1.q.out Fri May 30 17:37:05 2014
@@ -1,6 +1,10 @@
-PREHOOK: query: drop table char_join1_ch1
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table char_join1_ch1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table char_join1_ch1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+drop table char_join1_ch1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: drop table char_join1_ch2
 PREHOOK: type: DROPTABLE
@@ -74,12 +78,12 @@ POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@char_join1_str
 PREHOOK: query: -- Join char with same length char
-select * from char_join1_ch1 a join char_join1_ch1 b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_ch1 b on (a.c2 = b.c2)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char_join1_ch1
 #### A masked pattern was here ####
 POSTHOOK: query: -- Join char with same length char
-select * from char_join1_ch1 a join char_join1_ch1 b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_ch1 b on (a.c2 = b.c2)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char_join1_ch1
 #### A masked pattern was here ####
@@ -89,13 +93,13 @@ POSTHOOK: Input: default@char_join1_ch1
 2	abc       	2	abc       
 3	 abc      	3	 abc      
 PREHOOK: query: -- Join char with different length char
-select * from char_join1_ch1 a join char_join1_ch2 b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_ch2 b on (a.c2 = b.c2)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char_join1_ch1
 PREHOOK: Input: default@char_join1_ch2
 #### A masked pattern was here ####
 POSTHOOK: query: -- Join char with different length char
-select * from char_join1_ch1 a join char_join1_ch2 b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_ch2 b on (a.c2 = b.c2)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char_join1_ch1
 POSTHOOK: Input: default@char_join1_ch2
@@ -106,13 +110,13 @@ POSTHOOK: Input: default@char_join1_ch2
 2	abc       	2	abc                 
 3	 abc      	3	 abc                
 PREHOOK: query: -- Join char with string
-select * from char_join1_ch1 a join char_join1_str b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_str b on (a.c2 = b.c2)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@char_join1_ch1
 PREHOOK: Input: default@char_join1_str
 #### A masked pattern was here ####
 POSTHOOK: query: -- Join char with string
-select * from char_join1_ch1 a join char_join1_str b on (a.c2 = b.c2) order by a.c1
+select * from char_join1_ch1 a join char_join1_str b on (a.c2 = b.c2)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char_join1_ch1
 POSTHOOK: Input: default@char_join1_str