Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
 (original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
 Fri Jan 23 19:59:11 2015
@@ -44,11 +44,11 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
-              outputColumnNames: key, value
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
-                keys: key (type: string), value (type: string), '0' (type: 
string)
+                keys: _col0 (type: string), _col1 (type: string), '0' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1500 Data size: 15936 Basic stats: 
COMPLETE Column stats: NONE
@@ -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
@@ -231,11 +232,11 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
-              outputColumnNames: key, value
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
-                keys: key (type: string), value (type: string), '0' (type: 
string)
+                keys: _col0 (type: string), _col1 (type: string), '0' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -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
@@ -418,11 +420,11 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
-              outputColumnNames: key, value
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
-                keys: key (type: string), value (type: string), '0' (type: 
string)
+                keys: _col0 (type: string), _col1 (type: string), '0' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
@@ -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/llap/ql/src/test/results/clientpositive/input14.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/input14.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/input14.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/input14.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/input17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/input17.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/input17.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/input17.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/input18.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/input18.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/input18.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/input18.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/input23.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/input23.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/input23.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/input23.q.out Fri Jan 
23 19:59:11 2015
@@ -129,7 +129,7 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:a]
+        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:a]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/input_part2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/input_part2.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/input_part2.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/input_part2.q.out Fri 
Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/join0.q.java1.7.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join0.q.java1.7.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join0.q.java1.7.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join0.q.java1.7.out 
Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/join15.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join15.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join15.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join15.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join17.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join17.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join17.q.out Fri Jan 
23 19:59:11 2015
@@ -153,7 +153,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_0:src1, $hdt$_0:$hdt$_1:src1]
+        /src [$hdt$_0:src1, $hdt$_1:src1]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join18.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join18.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join18.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join18.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join20.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join20.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join20.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join21.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join21.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join21.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join21.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join23.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join23.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join23.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join23.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join32_lessSize.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join32_lessSize.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join32_lessSize.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join32_lessSize.q.out 
Fri Jan 23 19:59:11 2015
@@ -1931,11 +1931,11 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:y 
+        $hdt$_0:$hdt$_0:$hdt$_0:y 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:y 
+        $hdt$_0:$hdt$_0:$hdt$_0:y 
           TableScan
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -2089,12 +2089,12 @@ STAGE PLANS:
               name: default.src1
             name: default.src1
       Truncated Path -> Alias:
-        /src1 [$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x]
+        /src1 [$hdt$_0:$hdt$_0:$hdt$_1:x]
 
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:z 
+        $hdt$_1:z 
           Fetch Operator
             limit: -1
             Partition Description:
@@ -2144,7 +2144,7 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:z 
+        $hdt$_1:z 
           TableScan
             alias: z
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join34.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join34.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join34.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join34.q.out Fri Jan 
23 19:59:11 2015
@@ -148,11 +148,11 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:x 
+        $hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:x 
+        $hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -374,7 +374,7 @@ STAGE PLANS:
               name: default.src1
             name: default.src1
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_0-subquery1:$hdt$_0-subquery1:x, 
$hdt$_0:$hdt$_0-subquery2:$hdt$_0-subquery2:x]
+        /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x, 
$hdt$_0-subquery2:$hdt$_0-subquery2:x]
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join35.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join35.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join35.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join35.q.out Fri Jan 
23 19:59:11 2015
@@ -232,7 +232,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:x]
+        /src [$hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:x]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -262,11 +262,11 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:x 
+        $hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:x 
+        $hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -569,7 +569,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_0:x]
+        /src [$hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_0:x]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join6.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join6.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join6.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join6.q.out Fri Jan 
23 19:59:11 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/llap/ql/src/test/results/clientpositive/join7.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join7.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join7.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join7.q.out Fri Jan 
23 19:59:11 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 
   (
@@ -48,9 +52,8 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
+  Stage-0 depends on stages: Stage-1
+  Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
   Stage: Stage-1
@@ -88,32 +91,6 @@ STAGE PLANS:
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
-      Reduce Operator Tree:
-        Join Operator
-          condition map:
-               Outer Join 0 to 1
-          keys:
-            0 _col0 (type: string)
-            1 _col0 (type: string)
-          outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column 
stats: NONE
-          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: string)
-              sort order: +
-              Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE 
Column stats: NONE
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col3 (type: string)
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -133,19 +110,21 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Outer Join 0 to 1
+               Left Outer Join0 to 2
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
+            2 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 66 Data size: 706 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
             expressions: UDFToInteger(_col0) (type: int), _col1 (type: 
string), UDFToInteger(_col2) (type: int), _col3 (type: string), 
UDFToInteger(_col4) (type: int), _col5 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-            Statistics: Num rows: 66 Data size: 706 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 66 Data size: 706 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -162,7 +141,7 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest1
 
-  Stage: Stage-3
+  Stage: Stage-2
     Stats-Aggr Operator
 
 PREHOOK: query: FROM (
@@ -208,7 +187,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.c1 EXPRESSION [(src)src1.FieldSchema(name:key, 
type:string, comment:default), ]
-POSTHOOK: Lineage: dest1.c2 EXPRESSION [(src)src1.FieldSchema(name:value, 
type:string, comment:default), ]
+POSTHOOK: Lineage: dest1.c2 SIMPLE [(src)src1.FieldSchema(name:value, 
type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c3 EXPRESSION [(src)src1.FieldSchema(name:key, 
type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c4 SIMPLE [(src)src1.FieldSchema(name:value, 
type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c5 EXPRESSION [(src)src1.FieldSchema(name:key, 
type:string, comment:default), ]
@@ -221,9 +200,6 @@ POSTHOOK: query: SELECT dest1.* FROM des
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-NULL   NULL    24      val_24  NULL    NULL
-NULL   NULL    24      val_24  NULL    NULL
-NULL   NULL    20      val_20  NULL    NULL
 11     val_11  NULL    NULL    NULL    NULL
 12     val_12  NULL    NULL    NULL    NULL
 12     val_12  NULL    NULL    NULL    NULL
@@ -235,3 +211,6 @@ NULL        NULL    20      val_20  NULL    NULL
 18     val_18  18      val_18  NULL    NULL
 18     val_18  18      val_18  NULL    NULL
 19     val_19  19      val_19  NULL    NULL
+NULL   NULL    20      val_20  NULL    NULL
+NULL   NULL    24      val_24  NULL    NULL
+NULL   NULL    24      val_24  NULL    NULL

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join9.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join9.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join9.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join9.q.out Fri Jan 
23 19:59:11 2015
@@ -214,8 +214,8 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_1:src2]
-        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:src1]
+        /src [$hdt$_1:src2]
+        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:src1]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/join_array.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join_array.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join_array.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join_array.q.out Fri 
Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/join_nullsafe.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/join_nullsafe.q.out 
Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
 (original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/limit_partition_metadataonly.q.out
 Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/limit_pushdown.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/limit_pushdown.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/limit_pushdown.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/limit_pushdown.q.out 
Fri Jan 23 19:59:11 2015
@@ -344,11 +344,11 @@ val_129   130.0
 val_131        132.0
 PREHOOK: query: -- distincts
 explain
-select distinct(cdouble) from alltypesorc limit 20
+select distinct(cdouble) as dis from alltypesorc order by dis limit 20
 PREHOOK: type: QUERY
 POSTHOOK: query: -- distincts
 explain
-select distinct(cdouble) from alltypesorc limit 20
+select distinct(cdouble) as dis from alltypesorc order by dis limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -403,11 +403,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select distinct(cdouble) from alltypesorc limit 20
+PREHOOK: query: select distinct(cdouble) as dis from alltypesorc order by dis 
limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-POSTHOOK: query: select distinct(cdouble) from alltypesorc limit 20
+POSTHOOK: query: select distinct(cdouble) as dis from alltypesorc order by dis 
limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
@@ -1175,15 +1175,16 @@ POSTHOOK: Input: default@src
 187    val_187 val_187 val_187 val_187 val_187 val_187 val_187 val_187
 PREHOOK: query: -- flush for group-by
 explain
-select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) limit 100
+select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) order by sum 
limit 100
 PREHOOK: type: QUERY
 POSTHOOK: query: -- flush for group-by
 explain
-select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) limit 100
+select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) order by sum 
limit 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-2 depends on stages: Stage-1
+  Stage-0 depends on stages: Stage-2
 
 STAGE PLANS:
   Stage: Stage-1
@@ -1201,7 +1202,6 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                TopN Hash Memory Usage: 2.0E-5
                 value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Group By Operator
@@ -1214,16 +1214,37 @@ STAGE PLANS:
             expressions: _col1 (type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
-            Limit
-              Number of rows: 100
+            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: double)
+              sort order: +
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
+              TopN Hash Memory Usage: 2.0E-5
+      Reduce Operator Tree:
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: double)
+          outputColumnNames: _col0
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
+          Limit
+            Number of rows: 100
+            Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE 
Column stats: NONE
+            File Output Operator
+              compressed: false
               Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE 
Column stats: NONE
-              File Output Operator
-                compressed: false
-                Statistics: Num rows: 100 Data size: 1000 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
+              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
@@ -1231,29 +1252,35 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) limit 100
+PREHOOK: query: select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) order by sum 
limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) limit 100
+POSTHOOK: query: select sum(key) as sum from src group by 
concat(key,value,value,value,value,value,value,value,value,value) order by sum 
limit 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0.0
 10.0
+102.0
+105.0
 105.0
 11.0
 111.0
 114.0
-1150.0
+116.0
 116.0
 126.0
 131.0
 133.0
+134.0
 136.0
 143.0
+144.0
 145.0
+15.0
 150.0
+152.0
 153.0
 155.0
 156.0
@@ -1263,6 +1290,8 @@ POSTHOOK: Input: default@src
 162.0
 163.0
 166.0
+166.0
+168.0
 168.0
 17.0
 170.0
@@ -1275,67 +1304,59 @@ POSTHOOK: Input: default@src
 189.0
 19.0
 190.0
+190.0
 192.0
 194.0
+194.0
 196.0
+196.0
+2.0
 20.0
 200.0
 201.0
 202.0
 206.0
 208.0
+210.0
 214.0
 218.0
 222.0
 226.0
 226.0
 228.0
-235.0
-236.0
 24.0
-240.0
-250.0
-258.0
-268.0
-274.0
-292.0
-298.0
+27.0
+28.0
+30.0
 30.0
-304.0
-328.0
-330.0
-344.0
-348.0
-350.0
-352.0
-357.0
-358.0
+33.0
+34.0
 36.0
-382.0
-384.0
-390.0
-394.0
-400.0
-406.0
-410.0
-414.0
-418.0
-426.0
-432.0
-434.0
-438.0
-442.0
-446.0
-448.0
-458.0
-466.0
-474.0
-476.0
-478.0
-501.0
-552.0
-561.0
-579.0
-597.0
-624.0
-676.0
+4.0
+41.0
+43.0
+44.0
+47.0
+48.0
+52.0
+53.0
+54.0
+57.0
+64.0
+65.0
+66.0
+69.0
+74.0
+74.0
+77.0
+78.0
+8.0
+80.0
+82.0
+84.0
+85.0
+86.0
+87.0
+9.0
+92.0
+96.0

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/louter_join_ppr.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/louter_join_ppr.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/louter_join_ppr.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/louter_join_ppr.q.out 
Fri Jan 23 19:59:11 2015
@@ -761,11 +761,11 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_1:b]
-        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:a]
-        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:a]
-        /srcpart/ds=2008-04-09/hr=11 [$hdt$_0:$hdt$_0:a]
-        /srcpart/ds=2008-04-09/hr=12 [$hdt$_0:$hdt$_0:a]
+        /src [$hdt$_1:b]
+        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:a]
+        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:a]
+        /srcpart/ds=2008-04-09/hr=11 [$hdt$_0:a]
+        /srcpart/ds=2008-04-09/hr=12 [$hdt$_0:a]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator
@@ -1522,9 +1522,9 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /src [$hdt$_0:$hdt$_1:b]
-        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:a]
-        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:a]
+        /src [$hdt$_1:b]
+        /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:a]
+        /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:a]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
 (original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
 Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out 
Fri Jan 23 19:59:11 2015
@@ -574,11 +574,11 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -627,11 +627,11 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_2:src 
+        $hdt$_0:$hdt$_2:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_2:src 
+        $hdt$_0:$hdt$_2:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out 
(original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out 
Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/metadataonly1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/metadataonly1.q.out 
Fri Jan 23 19:59:11 2015
@@ -614,8 +614,8 @@ STAGE PLANS:
                   value expressions: _col0 (type: string)
                   auto parallelism: false
       Path -> Alias:
-        -mr-10005default.test1{ds=1} 
[$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
-        -mr-10006default.test1{ds=2} 
[$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
       Path -> Partition:
         -mr-10005default.test1{ds=1} 
           Partition
@@ -696,8 +696,8 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        -mr-10005default.test1{ds=1} 
[$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
-        -mr-10006default.test1{ds=2} 
[$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
+        -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -858,8 +858,8 @@ STAGE PLANS:
               name: default.test1
             name: default.test1
       Truncated Path -> Alias:
-        /test1/ds=1 [$hdt$_0:$hdt$_0:$hdt$_0:a2]
-        /test1/ds=2 [$hdt$_0:$hdt$_0:$hdt$_0:a2]
+        /test1/ds=1 [$hdt$_0:$hdt$_0:a2]
+        /test1/ds=2 [$hdt$_0:$hdt$_0:a2]
 #### A masked pattern was here ####
       Needs Tagging: true
       Reduce Operator Tree:

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/multiMapJoin2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/multiMapJoin2.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/multiMapJoin2.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/multiMapJoin2.q.out 
Fri Jan 23 19:59:11 2015
@@ -23,14 +23,14 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:y1 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_1:y1 
           Fetch Operator
             limit: -1
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:y1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:y1 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -45,7 +45,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:y1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -266,11 +266,11 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:y1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:y1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -319,11 +319,11 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:y1 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_1:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:y1 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -555,11 +555,11 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:x1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:x1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:x1 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_1:x1 
           TableScan
             alias: x1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -761,11 +761,11 @@ STAGE PLANS:
   Stage: Stage-17
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -993,11 +993,11 @@ STAGE PLANS:
   Stage: Stage-18
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:y1 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:y1 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -1159,14 +1159,14 @@ STAGE PLANS:
   Stage: Stage-9
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:y1 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:y1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -1181,7 +1181,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:y1 
+        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:y1 
           TableScan
             alias: y1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -1658,11 +1658,11 @@ STAGE PLANS:
   Stage: Stage-14
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
           TableScan
             alias: x1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -1823,11 +1823,11 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
+        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x1 
           TableScan
             alias: x1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
@@ -2222,11 +2222,11 @@ STAGE PLANS:
   Stage: Stage-15
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        
null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:a 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        
null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:a 
+        null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a 
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -2382,11 +2382,11 @@ STAGE PLANS:
   Stage: Stage-16
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        
null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:a 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        
null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:a 
+        null-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a 
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
 (original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
 Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/optimize_nullscan.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/optimize_nullscan.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/optimize_nullscan.q.out 
(original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/optimize_nullscan.q.out 
Fri Jan 23 19:59:11 2015
@@ -1,4 +1,4 @@
-PREHOOK: query: -- SORT_BEFORE_DIFF
+PREHOOK: query: -- SORT_QUERY_RESULTS
 
 -- Disable CBO here, because it messes with the cases specifically crafted for 
the optimizer.
 -- Instead, we could improve the optimizer to recognize more cases, e.g. 
filter before join.
@@ -6,7 +6,7 @@ PREHOOK: query: -- SORT_BEFORE_DIFF
 explain extended 
 select key from src where false
 PREHOOK: type: QUERY
-POSTHOOK: query: -- SORT_BEFORE_DIFF
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 -- Disable CBO here, because it messes with the cases specifically crafted for 
the optimizer.
 -- Instead, we could improve the optimizer to recognize more cases, e.g. 
filter before join.
@@ -1218,8 +1218,8 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-2000
 0
+2000
 Warning: Shuffle Join JOIN[11][tables = [a, b]] in Stage 'Stage-1:MAPRED' is a 
cross product
 PREHOOK: query: explain extended
 select * from (select key from src where false) a left outer join (select 
value from srcpart limit 0) b

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/orc_analyze.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/orc_analyze.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/orc_analyze.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/orc_analyze.q.out Fri 
Jan 23 19:59:11 2015
@@ -107,7 +107,7 @@ Table Parameters:
        numFiles                1                   
        numRows                 100                 
        rawDataSize             52600               
-       totalSize               3123                
+       totalSize               3158                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -197,7 +197,7 @@ Table Parameters:
        numFiles                1                   
        numRows                 100                 
        rawDataSize             52600               
-       totalSize               3123                
+       totalSize               3158                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -313,7 +313,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2026                
+       totalSize               2055                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -358,7 +358,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2045                
+       totalSize               2071                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -460,7 +460,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2026                
+       totalSize               2055                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -505,7 +505,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2045                
+       totalSize               2071                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -627,7 +627,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2026                
+       totalSize               2055                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -672,7 +672,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2045                
+       totalSize               2071                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -780,7 +780,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2026                
+       totalSize               2055                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -825,7 +825,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             22050               
-       totalSize               2045                
+       totalSize               2071                
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -992,7 +992,7 @@ Partition Parameters:
        numFiles                1                   
        numRows                 50                  
        rawDataSize             21950               
-       totalSize               2026                
+       totalSize               2055                
 #### A masked pattern was here ####
                 
 # Storage Information           

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
 (original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
 Fri Jan 23 19:59:11 2015
@@ -747,9 +747,6 @@ POSTHOOK: query: SELECT t, si, d, s FROM
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_pred
 #### A masked pattern was here ####
-101    327     11.48   gabriella ellison
-15     334     11.12   jessica robinson
-7      320     11.54   bob ellison
 PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE d >= ROUND(9.99)
   AND d < 12
@@ -946,7 +943,6 @@ POSTHOOK: query: SELECT t, si, d, s FROM
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_pred
 #### A masked pattern was here ####
-15     334     11.12   jessica robinson
 PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE t > 10
   AND t <> 101

Modified: hive/branches/llap/ql/src/test/results/clientpositive/ppd2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ppd2.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ppd2.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ppd2.q.out Fri Jan 23 
19:59:11 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/llap/ql/src/test/results/clientpositive/ppd_clusterby.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ppd_clusterby.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ppd_clusterby.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ppd_clusterby.q.out 
Fri Jan 23 19:59:11 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/llap/ql/src/test/results/clientpositive/ppd_gby_join.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/ppd_gby_join.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/ppd_gby_join.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/ppd_gby_join.q.out 
Fri Jan 23 19:59:11 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT src1.c1, count(1) 
 FROM
 (SELECT src.key AS c1, src.value AS c2 from src where src.key > '1' ) src1
@@ -8,7 +10,9 @@ ON src1.c1 = src2.c3 AND src1.c1 < '400'
 WHERE src1.c1 > '20' AND (src1.c2 < 'val_50' OR src1.c1 > '2') AND (src2.c3 > 
'50' OR src1.c1 < '50') AND (src2.c3 <> '4')
 GROUP BY src1.c1
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT src1.c1, count(1) 
 FROM
 (SELECT src.key AS c1, src.value AS c2 from src where src.key > '1' ) src1


Reply via email to