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

svn commit: r1653769 [10/14] - in /hive/branches/spark: ./ beeline/src/java/org/apache/hive/beeline/ cli/src/java/org/apache/hadoop/hive/cli/ common/src/java/org/apache/hadoop/hive/common/ common/src/java/org/apache/hadoop/hive/conf/ data/scripts/ dev-...

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out Thu Jan 22 05:05:05 2015
@@ -71,8 +71,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -148,8 +149,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -273,8 +275,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -374,8 +377,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out Thu Jan 22 05:05:05 2015
@@ -88,8 +88,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -228,8 +229,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out Thu Jan 22 05:05:05 2015
@@ -55,8 +55,9 @@ STAGE PLANS:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string)
             outputColumnNames: _col0, _col1
@@ -140,8 +141,9 @@ STAGE PLANS:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string)
             outputColumnNames: _col0, _col1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out Thu Jan 22 05:05:05 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest_g3(ke
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest_g3
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppr.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppr.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_ppr.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_resolution.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_resolution.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_resolution.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_resolution.q.out Thu Jan 22 05:05:05 2015
@@ -704,7 +704,9 @@ STAGE PLANS:
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: bigint)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           PTF Operator
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/spark/ql/src/test/results/clientpositive/groupby_rollup1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/groupby_rollup1.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/groupby_rollup1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/groupby_rollup1.q.out Thu Jan 22 05:05:05 2015
@@ -56,8 +56,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -133,8 +134,9 @@ STAGE PLANS:
           aggregations: count(DISTINCT KEY._col2:0._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2
+          outputColumnNames: _col0, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col2 (type: bigint)
             outputColumnNames: _col0, _col1
@@ -230,8 +232,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -307,8 +310,9 @@ STAGE PLANS:
           aggregations: count(DISTINCT KEY._col2:0._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string)
           mode: complete
-          outputColumnNames: _col0, _col1, _col2
+          outputColumnNames: _col0, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col2 (type: bigint)
             outputColumnNames: _col0, _col1
@@ -445,8 +449,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
             outputColumnNames: _col0, _col1, _col2
@@ -512,8 +517,9 @@ STAGE PLANS:
           aggregations: sum(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: final
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), UDFToInteger(_col3) (type: int)
             outputColumnNames: _col0, _col1, _col2

Modified: hive/branches/spark/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/identity_project_remove_skip.q.out Thu Jan 22 05:05:05 2015
@@ -135,13 +135,13 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: '105' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: '105' (type: string)
               Statistics: Num rows: 62 Data size: 658 Basic stats: COMPLETE Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: '105' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: '105' (type: string)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out Thu Jan 22 05:05:05 2015
@@ -63,8 +63,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -143,9 +144,9 @@ SerDe Library:      	org.apache.hadoop.h
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
+Num Buckets:        	1                   	 
+Bucket Columns:     	[key, value]        	 
+Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1)]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Test rollup, should be bucketed and sorted on key, value, grouping_key
@@ -250,8 +251,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -330,9 +332,9 @@ SerDe Library:      	org.apache.hadoop.h
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
+Num Buckets:        	1                   	 
+Bucket Columns:     	[key, value]        	 
+Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1)]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Test cube, should be bucketed and sorted on key, value, grouping_key
@@ -437,8 +439,9 @@ STAGE PLANS:
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2, _col3
+          outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
@@ -517,9 +520,9 @@ SerDe Library:      	org.apache.hadoop.h
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	-1                  	 
-Bucket Columns:     	[]                  	 
-Sort Columns:       	[]                  	 
+Num Buckets:        	1                   	 
+Bucket Columns:     	[key, value]        	 
+Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1)]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Test grouping sets, should be bucketed and sorted on key, value, grouping_key

Modified: hive/branches/spark/ql/src/test/results/clientpositive/input14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/input14.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/input14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/input14.q.out Thu Jan 22 05:05:05 2015
@@ -105,11 +105,15 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/input17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/input17.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/input17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/input17.q.out Thu Jan 22 05:05:05 2015
@@ -102,15 +102,18 @@ POSTHOOK: Input: default@src_thrift
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-NULL	NULL
 -1461153966	{"myint":49,"mystring":"343","underscore_int":7}
 -1952710705	{"myint":25,"mystring":"125","underscore_int":5}
 -734328905	{"myint":16,"mystring":"64","underscore_int":4}
@@ -121,3 +124,4 @@ NULL	NULL
 336964422	{"myint":81,"mystring":"729","underscore_int":9}
 465985201	{"myint":1,"mystring":"1","underscore_int":1}
 477111225	{"myint":9,"mystring":"27","underscore_int":3}
+NULL	NULL

Modified: hive/branches/spark/ql/src/test/results/clientpositive/input18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/input18.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/input18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/input18.q.out Thu Jan 22 05:05:05 2015
@@ -105,11 +105,15 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/input_part2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/input_part2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/input_part2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/input_part2.q.out Thu Jan 22 05:05:05 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest2(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest2
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
@@ -714,13 +718,6 @@ POSTHOOK: Input: default@dest1
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
-2	val_2	12	2008-04-08
-4	val_4	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-8	val_8	12	2008-04-08
-9	val_9	12	2008-04-08
 10	val_10	12	2008-04-08
 11	val_11	12	2008-04-08
 12	val_12	12	2008-04-08
@@ -731,6 +728,7 @@ POSTHOOK: Input: default@dest1
 18	val_18	12	2008-04-08
 18	val_18	12	2008-04-08
 19	val_19	12	2008-04-08
+2	val_2	12	2008-04-08
 20	val_20	12	2008-04-08
 24	val_24	12	2008-04-08
 24	val_24	12	2008-04-08
@@ -746,12 +744,16 @@ POSTHOOK: Input: default@dest1
 35	val_35	12	2008-04-08
 37	val_37	12	2008-04-08
 37	val_37	12	2008-04-08
+4	val_4	12	2008-04-08
 41	val_41	12	2008-04-08
 42	val_42	12	2008-04-08
 42	val_42	12	2008-04-08
 43	val_43	12	2008-04-08
 44	val_44	12	2008-04-08
 47	val_47	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
 51	val_51	12	2008-04-08
 51	val_51	12	2008-04-08
 53	val_53	12	2008-04-08
@@ -775,6 +777,7 @@ POSTHOOK: Input: default@dest1
 76	val_76	12	2008-04-08
 77	val_77	12	2008-04-08
 78	val_78	12	2008-04-08
+8	val_8	12	2008-04-08
 80	val_80	12	2008-04-08
 82	val_82	12	2008-04-08
 83	val_83	12	2008-04-08
@@ -784,6 +787,7 @@ POSTHOOK: Input: default@dest1
 85	val_85	12	2008-04-08
 86	val_86	12	2008-04-08
 87	val_87	12	2008-04-08
+9	val_9	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
@@ -806,13 +810,6 @@ POSTHOOK: Input: default@dest2
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
-2	val_2	12	2008-04-09
-4	val_4	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-8	val_8	12	2008-04-09
-9	val_9	12	2008-04-09
 10	val_10	12	2008-04-09
 11	val_11	12	2008-04-09
 12	val_12	12	2008-04-09
@@ -823,6 +820,7 @@ POSTHOOK: Input: default@dest2
 18	val_18	12	2008-04-09
 18	val_18	12	2008-04-09
 19	val_19	12	2008-04-09
+2	val_2	12	2008-04-09
 20	val_20	12	2008-04-09
 24	val_24	12	2008-04-09
 24	val_24	12	2008-04-09
@@ -838,12 +836,16 @@ POSTHOOK: Input: default@dest2
 35	val_35	12	2008-04-09
 37	val_37	12	2008-04-09
 37	val_37	12	2008-04-09
+4	val_4	12	2008-04-09
 41	val_41	12	2008-04-09
 42	val_42	12	2008-04-09
 42	val_42	12	2008-04-09
 43	val_43	12	2008-04-09
 44	val_44	12	2008-04-09
 47	val_47	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
 51	val_51	12	2008-04-09
 51	val_51	12	2008-04-09
 53	val_53	12	2008-04-09
@@ -867,6 +869,7 @@ POSTHOOK: Input: default@dest2
 76	val_76	12	2008-04-09
 77	val_77	12	2008-04-09
 78	val_78	12	2008-04-09
+8	val_8	12	2008-04-09
 80	val_80	12	2008-04-09
 82	val_82	12	2008-04-09
 83	val_83	12	2008-04-09
@@ -876,6 +879,7 @@ POSTHOOK: Input: default@dest2
 85	val_85	12	2008-04-09
 86	val_86	12	2008-04-09
 87	val_87	12	2008-04-09
+9	val_9	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join0.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join0.q.java1.7.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join0.q.java1.7.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join0.q.java1.7.out Thu Jan 22 05:05:05 2015
@@ -1,5 +1,6 @@
 Warning: Shuffle Join JOIN[8][tables = [src1, src2]] in Stage 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 
@@ -10,6 +11,7 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
 POSTHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join15.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join15.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join18.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join18.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join18.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join18.q.out Thu Jan 22 05:05:05 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -11,7 +13,9 @@ PREHOOK: query: EXPLAIN
  ) b 
  ON (a.key = b.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -176,7 +180,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL		7
 0	3	NULL	NULL
 10	1	NULL	NULL
 100	2	NULL	NULL
@@ -486,3 +489,4 @@ NULL	NULL		7
 96	1	NULL	NULL
 97	2	NULL	NULL
 98	2	98	1
+NULL	NULL		7

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join20.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join20.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
@@ -111,6 +115,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -601,64 +663,6 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9
 PREHOOK: query: EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
@@ -772,6 +776,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -1262,61 +1324,3 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join21.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join21.q.out Thu Jan 22 05:05:05 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join23.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join23.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join23.q.out Thu Jan 22 05:05:05 2015
@@ -1,8 +1,12 @@
 Warning: Shuffle Join JOIN[4][tables = [src1, src2]] in Stage 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join6.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join6.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join6.q.out Thu Jan 22 05:05:05 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -21,7 +23,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join7.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join7.q.out Thu Jan 22 05:05:05 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -26,7 +28,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join_array.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join_array.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join_array.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join_array.q.out Thu Jan 22 05:05:05 2015
@@ -30,11 +30,15 @@ POSTHOOK: query: load data local inpath
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@tinyb
-PREHOOK: query: select * from tinyA
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+select * from tinyA
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tinya
 #### A masked pattern was here ####
-POSTHOOK: query: select * from tinyA
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+select * from tinyA
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tinya
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/join_nullsafe.q.out Thu Jan 22 05:05:05 2015
@@ -1525,7 +1525,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: null (type: void)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: null (type: void)
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: int)
           TableScan
@@ -1537,7 +1537,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: null (type: void)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: null (type: void)
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 value expressions: key (type: int)
       Reduce Operator Tree:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out Thu Jan 22 05:05:05 2015
@@ -1,6 +1,10 @@
-PREHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08'
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select ds from srcpart where hr=11 and ds='2008-04-08'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08'
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select ds from srcpart where hr=11 and ds='2008-04-08'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-0 is a root stage

Modified: hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out Thu Jan 22 05:05:05 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 SELECT * FROM src1
   RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10)
@@ -8,7 +10,9 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 SELECT * FROM src1
   RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out Thu Jan 22 05:05:05 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 create table dest_1 (key STRING, value STRING) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_1
-POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 create table dest_1 (key STRING, value STRING) stored as textfile
 POSTHOOK: type: CREATETABLE
@@ -66,7 +70,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -231,6 +234,7 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+NULL	NULL	333444	555666	333444	555666
 PREHOOK: query: explain
 SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
@@ -341,7 +345,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -506,6 +509,7 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+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)
@@ -1162,7 +1166,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -1327,3 +1330,4 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+NULL	NULL	333444	555666	333444	555666

Modified: hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out Thu Jan 22 05:05:05 2015
@@ -94,6 +94,29 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE
               ListSink
 
+PREHOOK: query: -- Scans without limit (should be Fetch task now)
+explain select concat(key, value)  from src
+PREHOOK: type: QUERY
+POSTHOOK: query: -- Scans without limit (should be Fetch task now)
+explain select concat(key, value)  from src
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        TableScan
+          alias: src
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          Select Operator
+            expressions: concat(key, value) (type: string)
+            outputColumnNames: _col0
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            ListSink
+
 PREHOOK: query: -- from HIVE-7397, limit + partition pruning filter
 explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
 PREHOOK: type: QUERY
@@ -125,6 +148,32 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select cast(key as int) * 10, upper(value) from src limit 10
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 10
+      Processor Tree:
+        TableScan
+          alias: src
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+          Select Operator
+            expressions: (UDFToInteger(key) * 10) (type: int), upper(value) (type: string)
+            outputColumnNames: _col0, _col1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Limit
+              Number of rows: 10
+              Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE
+              ListSink
+
+PREHOOK: query: -- Scans without limit (should not be Fetch task now)
+explain select concat(key, value)  from src
+PREHOOK: type: QUERY
+POSTHOOK: query: -- Scans without limit (should not be Fetch task now)
+explain select concat(key, value)  from src
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
@@ -136,23 +185,20 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: (UDFToInteger(key) * 10) (type: int), upper(value) (type: string)
-              outputColumnNames: _col0, _col1
+              expressions: concat(key, value) (type: string)
+              outputColumnNames: _col0
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-              Limit
-                Number of rows: 10
-                Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE
-                  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
+              File Output Operator
+                compressed: false
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
-      limit: 10
+      limit: -1
       Processor Tree:
         ListSink
 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd2.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd2.q.out Thu Jan 22 05:05:05 2015
@@ -347,7 +347,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -359,7 +359,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd_clusterby.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd_clusterby.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd_clusterby.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd_clusterby.q.out Thu Jan 22 05:05:05 2015
@@ -25,7 +25,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '10' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '10' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -80,7 +80,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -92,7 +92,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -174,7 +174,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '10' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '10' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -229,7 +229,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -241,7 +241,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd_join4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd_join4.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd_join4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd_join4.q.out Thu Jan 22 05:05:05 2015
@@ -82,7 +82,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: 'a' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: 'a' (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           TableScan
             alias: t3
@@ -93,7 +93,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 'a' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 'a' (type: string)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd_outer_join5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd_outer_join5.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd_outer_join5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd_outer_join5.q.out Thu Jan 22 05:05:05 2015
@@ -73,9 +73,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
       Reduce Operator Tree:
@@ -126,9 +126,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -138,9 +138,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -164,10 +164,10 @@ STAGE PLANS:
             0 id (type: int)
             1 id (type: int)
             2 id (type: int)
-          outputColumnNames: _col1, _col2, _col7, _col8, _col12, _col13, _col14
+          outputColumnNames: _col0, _col1, _col2, _col7, _col8, _col12, _col13, _col14
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: 20 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
+            expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -203,9 +203,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -215,9 +215,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -241,10 +241,10 @@ STAGE PLANS:
             0 id (type: int)
             1 id (type: int)
             2 id (type: int)
-          outputColumnNames: _col1, _col2, _col7, _col8, _col12, _col13, _col14
+          outputColumnNames: _col0, _col1, _col2, _col7, _col8, _col12, _col13, _col14
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: 20 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
+            expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd_transform.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd_transform.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd_transform.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd_transform.q.out Thu Jan 22 05:05:05 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value)
@@ -7,7 +9,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ppd_union_view.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ppd_union_view.q.out Thu Jan 22 05:05:05 2015
@@ -179,7 +179,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: keymap (type: string), '2011-10-13' (type: string)
                 sort order: ++
-                Map-reduce partition columns: keymap (type: string)
+                Map-reduce partition columns: keymap (type: string), '2011-10-13' (type: string)
                 Statistics: Num rows: 1 Data size: 14 Basic stats: COMPLETE Column stats: NONE
                 tag: 0
                 value expressions: value (type: string)
@@ -195,7 +195,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: keymap (type: string), '2011-10-13' (type: string)
                 sort order: ++
-                Map-reduce partition columns: keymap (type: string)
+                Map-reduce partition columns: keymap (type: string), '2011-10-13' (type: string)
                 Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                 tag: 1
                 value expressions: key (type: string)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ptf_matchpath.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ptf_matchpath.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ptf_matchpath.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ptf_matchpath.q.out Thu Jan 22 05:05:05 2015
@@ -34,7 +34,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@flights_tiny
-PREHOOK: query: -- 1. basic Matchpath test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -47,7 +49,9 @@ from matchpath(on
 PREHOOK: type: QUERY
 PREHOOK: Input: default@flights_tiny
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. basic Matchpath test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -65,17 +69,17 @@ Baltimore	1142	2010	10	21	5	21
 Baltimore	1142	2010	10	22	4	22
 Baltimore	1142	2010	10	25	3	25
 Baltimore	1142	2010	10	26	2	26
-Chicago	1531	2010	10	21	2	21
-Chicago	1531	2010	10	25	3	25
-Chicago	1531	2010	10	26	2	26
 Baltimore	1599	2010	10	21	2	21
 Baltimore	1599	2010	10	25	3	25
 Baltimore	1599	2010	10	26	2	26
+Chicago	1531	2010	10	21	2	21
+Chicago	1531	2010	10	25	3	25
+Chicago	1531	2010	10	26	2	26
 Chicago	361	2010	10	20	2	20
-Washington	7291	2010	10	27	2	27
 Chicago	897	2010	10	20	4	20
 Chicago	897	2010	10	21	3	21
 Chicago	897	2010	10	22	2	22
+Washington	7291	2010	10	27	2	27
 PREHOOK: query: -- 2. Matchpath on 1 partition
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ptf_rcfile.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ptf_rcfile.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ptf_rcfile.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ptf_rcfile.q.out Thu Jan 22 05:05:05 2015
@@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@part_rc
-PREHOOK: query: -- testWindowingPTFWithPartRC
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartRC
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -49,7 +51,9 @@ order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_rc
 #### A masked pattern was here ####
-POSTHOOK: query: -- testWindowingPTFWithPartRC
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartRC
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out Thu Jan 22 05:05:05 2015
@@ -40,7 +40,9 @@ PREHOOK: Output: matchpathtest
 POSTHOOK: query: create temporary function matchpathtest as 'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: matchpathtest
-PREHOOK: query: -- 1. basic Matchpath test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpathtest(on 
         flights_tiny 
@@ -53,7 +55,9 @@ from matchpathtest(on
 PREHOOK: type: QUERY
 PREHOOK: Input: default@flights_tiny
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. basic Matchpath test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpathtest(on 
         flights_tiny 
@@ -71,17 +75,17 @@ Baltimore	1142	2010	10	21	5	21
 Baltimore	1142	2010	10	22	4	22
 Baltimore	1142	2010	10	25	3	25
 Baltimore	1142	2010	10	26	2	26
-Chicago	1531	2010	10	21	2	21
-Chicago	1531	2010	10	25	3	25
-Chicago	1531	2010	10	26	2	26
 Baltimore	1599	2010	10	21	2	21
 Baltimore	1599	2010	10	25	3	25
 Baltimore	1599	2010	10	26	2	26
+Chicago	1531	2010	10	21	2	21
+Chicago	1531	2010	10	25	3	25
+Chicago	1531	2010	10	26	2	26
 Chicago	361	2010	10	20	2	20
-Washington	7291	2010	10	27	2	27
 Chicago	897	2010	10	20	4	20
 Chicago	897	2010	10	21	3	21
 Chicago	897	2010	10	22	2	22
+Washington	7291	2010	10	27	2	27
 PREHOOK: query: drop temporary function matchpathtest
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: matchpathtest

Modified: hive/branches/spark/ql/src/test/results/clientpositive/ptf_seqfile.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/ptf_seqfile.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/ptf_seqfile.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/ptf_seqfile.q.out Thu Jan 22 05:05:05 2015
@@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@part_seq
-PREHOOK: query: -- testWindowingPTFWithPartSeqFile
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartSeqFile
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -49,7 +51,9 @@ order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_seq
 #### A masked pattern was here ####
-POSTHOOK: query: -- testWindowingPTFWithPartSeqFile
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartSeqFile
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/quotedid_basic.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/quotedid_basic.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/quotedid_basic.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/quotedid_basic.q.out Thu Jan 22 05:05:05 2015
@@ -195,9 +195,11 @@ STAGE PLANS:
               sort order: ++
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+              value expressions: _col0 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 (type: string)
+          outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           PTF Operator
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
@@ -278,9 +280,11 @@ STAGE PLANS:
               sort order: ++
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+              value expressions: _col0 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 (type: string)
+          outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           PTF Operator
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE

Modified: hive/branches/spark/ql/src/test/results/clientpositive/regex_col.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/regex_col.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/regex_col.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/regex_col.q.out Thu Jan 22 05:05:05 2015
@@ -174,7 +174,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '103' (type: string), _col2 (type: string), _col1 (type: string)
                   sort order: +++
-                  Map-reduce partition columns: _col2 (type: string), _col1 (type: string)
+                  Map-reduce partition columns: '103' (type: string), _col2 (type: string), _col1 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
@@ -189,7 +189,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '103' (type: string), _col2 (type: string), _col1 (type: string)
                   sort order: +++
-                  Map-reduce partition columns: _col2 (type: string), _col1 (type: string)
+                  Map-reduce partition columns: '103' (type: string), _col2 (type: string), _col1 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/spark/ql/src/test/results/clientpositive/sample3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/sample3.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/sample3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/sample3.q.out Thu Jan 22 05:05:05 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: -- no input pruning, sample filter
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN
 SELECT s.key
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
 PREHOOK: type: QUERY
-POSTHOOK: query: -- no input pruning, sample filter
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN
 SELECT s.key
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
@@ -55,48 +59,8 @@ POSTHOOK: Input: default@srcbucket
 0
 0
 0
-5
-5
-5
-5
 10
 10
-15
-15
-15
-15
-20
-20
-20
-30
-30
-35
-35
-35
-35
-35
-35
-40
-40
-50
-60
-65
-65
-65
-70
-70
-70
-70
-75
-80
-80
-85
-85
-90
-90
-90
-95
-95
 100
 100
 100
@@ -116,6 +80,10 @@ POSTHOOK: Input: default@srcbucket
 135
 140
 145
+15
+15
+15
+15
 150
 155
 160
@@ -134,6 +102,9 @@ POSTHOOK: Input: default@srcbucket
 190
 195
 195
+20
+20
+20
 200
 200
 205
@@ -167,6 +138,8 @@ POSTHOOK: Input: default@srcbucket
 285
 295
 295
+30
+30
 300
 300
 305
@@ -184,6 +157,12 @@ POSTHOOK: Input: default@srcbucket
 335
 340
 345
+35
+35
+35
+35
+35
+35
 355
 355
 360
@@ -204,6 +183,8 @@ POSTHOOK: Input: default@srcbucket
 395
 395
 395
+40
+40
 400
 405
 410
@@ -239,3 +220,26 @@ POSTHOOK: Input: default@srcbucket
 490
 495
 495
+5
+5
+5
+5
+50
+60
+65
+65
+65
+70
+70
+70
+70
+75
+80
+80
+85
+85
+90
+90
+90
+95
+95

Modified: hive/branches/spark/ql/src/test/results/clientpositive/sample5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/sample5.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/sample5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/sample5.q.out Thu Jan 22 05:05:05 2015
@@ -6,12 +6,16 @@ POSTHOOK: query: CREATE TABLE dest1(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: -- no input pruning, sample filter
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
 PREHOOK: type: QUERY
-POSTHOOK: query: -- no input pruning, sample filter
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
@@ -349,48 +353,8 @@ POSTHOOK: Input: default@dest1
 0	val_0
 0	val_1
 0	val_1
-5	val_5
-5	val_5
-5	val_5
-5	val_6
 10	val_10
 10	val_11
-15	val_15
-15	val_15
-15	val_16
-15	val_16
-20	val_20
-20	val_21
-20	val_21
-30	val_30
-30	val_31
-35	val_35
-35	val_35
-35	val_35
-35	val_36
-35	val_36
-35	val_36
-40	val_41
-40	val_41
-50	val_51
-60	val_61
-65	val_65
-65	val_66
-65	val_66
-70	val_70
-70	val_70
-70	val_70
-70	val_71
-75	val_76
-80	val_80
-80	val_81
-85	val_85
-85	val_86
-90	val_90
-90	val_90
-90	val_90
-95	val_95
-95	val_95
 100	val_100
 100	val_100
 100	val_101
@@ -410,6 +374,10 @@ POSTHOOK: Input: default@dest1
 135	val_136
 140	val_141
 145	val_145
+15	val_15
+15	val_15
+15	val_16
+15	val_16
 150	val_150
 155	val_155
 160	val_160
@@ -428,6 +396,9 @@ POSTHOOK: Input: default@dest1
 190	val_190
 195	val_195
 195	val_195
+20	val_20
+20	val_21
+20	val_21
 200	val_200
 200	val_200
 205	val_205
@@ -461,6 +432,8 @@ POSTHOOK: Input: default@dest1
 285	val_286
 295	val_296
 295	val_296
+30	val_30
+30	val_31
 300	val_301
 300	val_301
 305	val_305
@@ -478,6 +451,12 @@ POSTHOOK: Input: default@dest1
 335	val_336
 340	val_341
 345	val_345
+35	val_35
+35	val_35
+35	val_35
+35	val_36
+35	val_36
+35	val_36
 355	val_356
 355	val_356
 360	val_360
@@ -498,6 +477,8 @@ POSTHOOK: Input: default@dest1
 395	val_395
 395	val_396
 395	val_396
+40	val_41
+40	val_41
 400	val_400
 405	val_406
 410	val_411
@@ -533,3 +514,26 @@ POSTHOOK: Input: default@dest1
 490	val_491
 495	val_495
 495	val_496
+5	val_5
+5	val_5
+5	val_5
+5	val_6
+50	val_51
+60	val_61
+65	val_65
+65	val_66
+65	val_66
+70	val_70
+70	val_70
+70	val_70
+70	val_71
+75	val_76
+80	val_80
+80	val_81
+85	val_85
+85	val_86
+90	val_90
+90	val_90
+90	val_90
+95	val_95
+95	val_95

Modified: hive/branches/spark/ql/src/test/results/clientpositive/scriptfile1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/scriptfile1.q.out?rev=1653769&r1=1653768&r2=1653769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/scriptfile1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/scriptfile1.q.out Thu Jan 22 05:05:05 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: -- EXCLUDE_OS_WINDOWS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default