http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out 
b/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out
index 6a2396e..af85af9 100644
--- a/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out
+++ b/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out
@@ -1,9 +1,13 @@
-PREHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 
string, c6 string, c7 string) 
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 
string, c7 string) 
 partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T1
-POSTHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, 
c5 string, c6 string, c7 string) 
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 
string, c7 string) 
 partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/insert_into1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/insert_into1.q.out 
b/ql/src/test/results/clientpositive/tez/insert_into1.q.out
index 359470b..3d576a4 100644
--- a/ql/src/test/results/clientpositive/tez/insert_into1.q.out
+++ b/ql/src/test/results/clientpositive/tez/insert_into1.q.out
@@ -1,6 +1,10 @@
-PREHOOK: query: DROP TABLE insert_into1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE insert_into1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE insert_into1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE insert_into1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE insert_into1 (key int, value string)
 PREHOOK: type: CREATETABLE
@@ -10,9 +14,9 @@ POSTHOOK: query: CREATE TABLE insert_into1 (key int, value 
string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@insert_into1
-PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 
100
+PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER 
BY key LIMIT 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src 
LIMIT 100
+POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src 
ORDER BY key LIMIT 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -36,19 +40,17 @@ STAGE PLANS:
                     expressions: key (type: string), value (type: string)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 100
-                      Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
                   Number of rows: 100
                   Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
@@ -81,11 +83,11 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
-PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100
+PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key 
LIMIT 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into1
-POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100
+POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key 
LIMIT 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into1
@@ -103,7 +105,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
-10226524244
+-1142373758
 PREHOOK: query: explain 
 select count(*) from insert_into1
 PREHOOK: type: QUERY
@@ -129,9 +131,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 100
-PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 
100
+PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER 
BY key LIMIT 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src 
LIMIT 100
+POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src 
ORDER BY key LIMIT 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -155,19 +157,17 @@ STAGE PLANS:
                     expressions: key (type: string), value (type: string)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 100
-                      Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
                   Number of rows: 100
                   Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
@@ -200,11 +200,11 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
-PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
+PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key 
LIMIT 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into1
-POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
+POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key 
LIMIT 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into1
@@ -222,7 +222,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
-20453048488
+-2284747516
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into1
 PREHOOK: type: QUERY
@@ -248,9 +248,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 200
-PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src 
LIMIT 10
+PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src 
ORDER BY key LIMIT 10
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src 
LIMIT 10
+POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src 
ORDER BY key LIMIT 10
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -274,19 +274,17 @@ STAGE PLANS:
                     expressions: key (type: string), 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
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 10 Data size: 100 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                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
@@ -319,11 +317,11 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
-PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10
+PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY 
key LIMIT 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into1
-POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10
+POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER 
BY key LIMIT 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into1
@@ -341,7 +339,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
--826625916
+-2693537120
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into1
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/insert_into2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/insert_into2.q.out 
b/ql/src/test/results/clientpositive/tez/insert_into2.q.out
index 6bfa257..2c7ec63 100644
--- a/ql/src/test/results/clientpositive/tez/insert_into2.q.out
+++ b/ql/src/test/results/clientpositive/tez/insert_into2.q.out
@@ -13,10 +13,10 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@insert_into2
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') 
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') 
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -40,19 +40,17 @@ STAGE PLANS:
                     expressions: key (type: string), value (type: string)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 100
-                      Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
                   Number of rows: 100
                   Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
@@ -87,11 +85,11 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
-PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src limit 100
+PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into2@ds=1
-POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src limit 100
+POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
@@ -122,11 +120,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 #### A masked pattern was here ####
 100
-PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src limit 100
+PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into2@ds=1
-POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src limit 100
+POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
@@ -171,12 +169,12 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
 #### A masked pattern was here ####
--24159954504
+-39568181484
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -200,19 +198,17 @@ STAGE PLANS:
                     expressions: key (type: string), value (type: string)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 100
-                      Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
                   Number of rows: 100
                   Statistics: Num rows: 100 Data size: 1000 Basic stats: 
COMPLETE Column stats: NONE
@@ -248,12 +244,12 @@ STAGE PLANS:
     Stats-Aggr Operator
 
 PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into2@ds=2
 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 100
+  SELECT * FROM src order by key LIMIT 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=2
@@ -275,7 +271,7 @@ POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
--36239931656
+-59352272126
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY
@@ -302,10 +298,10 @@ POSTHOOK: Input: default@insert_into2
 #### A masked pattern was here ####
 100
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 50
+  SELECT * FROM src order by key LIMIT 50
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 50
+  SELECT * FROM src order by key LIMIT 50
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -329,19 +325,17 @@ STAGE PLANS:
                     expressions: key (type: string), value (type: string)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Limit
-                      Number of rows: 50
-                      Statistics: Num rows: 50 Data size: 500 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        sort order: 
-                        Statistics: Num rows: 50 Data size: 500 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: string), _col1 (type: 
string)
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string)
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Limit
                   Number of rows: 50
                   Statistics: Num rows: 50 Data size: 500 Basic stats: 
COMPLETE Column stats: NONE
@@ -377,12 +371,12 @@ STAGE PLANS:
     Stats-Aggr Operator
 
 PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 50
+  SELECT * FROM src order by key LIMIT 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@insert_into2@ds=2
 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
-  SELECT * FROM src LIMIT 50
+  SELECT * FROM src order by key LIMIT 50
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=2
@@ -404,7 +398,7 @@ POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
--27100860056
+-33609711132
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out 
b/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
index 6fadf5a..79ee3f0 100644
--- a/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
+++ b/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
@@ -86,11 +86,13 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value
+PREHOOK: query: -- SORT_QUERY_RESULTS
+select * from myinput1 a join myinput1 b on a.key<=>b.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1
 #### A masked pattern was here ####
-POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+select * from myinput1 a join myinput1 b on a.key<=>b.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out 
b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
index e9766db..7ca537d 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
@@ -77,10 +77,10 @@ POSTHOOK: Input: default@over1k
 POSTHOOK: Output: default@t2
 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, 
type:decimal(4,2), comment:null), ]
 PREHOOK: query: explain
-select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
-select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -90,7 +90,8 @@ STAGE PLANS:
   Stage: Stage-1
     Tez
       Edges:
-        Map 1 <- Map 2 (BROADCAST_EDGE)
+        Map 1 <- Map 3 (BROADCAST_EDGE)
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -109,21 +110,19 @@ STAGE PLANS:
                         1 dec (type: decimal(6,2))
                       outputColumnNames: _col0, _col4
                       input vertices:
-                        1 Map 2
+                        1 Map 3
                       Statistics: Num rows: 577 Data size: 64680 Basic stats: 
COMPLETE Column stats: NONE
                       HybridGraceHashJoin: true
                       Select Operator
                         expressions: _col0 (type: decimal(4,2)), _col4 (type: 
decimal(4,0))
                         outputColumnNames: _col0, _col1
                         Statistics: Num rows: 577 Data size: 64680 Basic 
stats: COMPLETE Column stats: NONE
-                        File Output Operator
-                          compressed: false
+                        Reduce Output Operator
+                          key expressions: _col0 (type: decimal(4,2))
+                          sort order: +
                           Statistics: Num rows: 577 Data size: 64680 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
-        Map 2 
+                          value expressions: _col1 (type: decimal(4,0))
+        Map 3 
             Map Operator Tree:
                 TableScan
                   alias: t2
@@ -137,6 +136,19 @@ STAGE PLANS:
                       Map-reduce partition columns: dec (type: decimal(6,2))
                       Statistics: Num rows: 525 Data size: 58800 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: dec (type: decimal(4,0))
+        Reducer 2 
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey0 (type: decimal(4,2)), 
VALUE._col0 (type: decimal(4,0))
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 577 Data size: 64680 Basic stats: 
COMPLETE Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 577 Data size: 64680 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
@@ -144,12 +156,12 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order 
by t1.dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) 
order by t1.dec
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
@@ -260,12 +272,12 @@ POSTHOOK: Input: default@t2
 9      9
 9      9
 9      9
-PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order 
by t1.dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
 PREHOOK: Input: default@t2
 #### A masked pattern was here ####
-POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec)
+POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) 
order by t1.dec
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/mrr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mrr.q.out 
b/ql/src/test/results/clientpositive/tez/mrr.q.out
index d90b27f..d42f9b0 100644
--- a/ql/src/test/results/clientpositive/tez/mrr.q.out
+++ b/ql/src/test/results/clientpositive/tez/mrr.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: -- simple query with multiple reduce stages
+-- SORT_QUERY_RESULTS
+
 EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
 PREHOOK: type: QUERY
 POSTHOOK: query: -- simple query with multiple reduce stages
+-- SORT_QUERY_RESULTS
+
 EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -78,337 +82,337 @@ POSTHOOK: query: SELECT key, count(value) as cnt FROM src 
GROUP BY key ORDER BY
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-490    1
-287    1
-286    1
-285    1
-284    1
-283    1
+0      3
+10     1
+100    2
+103    2
+104    2
+105    1
+11     1
+111    1
+113    2
 114    1
-487    1
-485    1
-28     1
-484    1
-181    1
-275    1
-274    1
-183    1
-483    1
-27     1
-266    1
-482    1
-263    1
-262    1
-260    1
-481    1
-258    1
-257    1
 116    1
-479    1
-252    1
-249    1
-248    1
-247    1
-244    1
-92     1
-241    1
-477    1
-475    1
-472    1
-470    1
-235    1
-47     1
-186    1
+118    2
+119    3
+12     2
+120    2
+125    2
 126    1
-228    1
-226    1
+128    3
+129    2
 131    1
-467    1
-222    1
 133    1
-82     1
-218    1
-80     1
-460    1
-214    1
-8      1
-78     1
-189    1
-457    1
-455    1
+134    2
 136    1
-202    1
-201    1
-453    1
-20     1
-2      1
-19     1
-452    1
-196    1
-449    1
-194    1
-190    1
-192    1
-448    1
-446    1
-444    1
-443    1
-44     1
-77     1
+137    2
+138    4
 143    1
-437    1
-436    1
-435    1
-432    1
 145    1
+146    2
+149    2
+15     2
 150    1
-43     1
-10     1
-427    1
-74     1
-421    1
-9      1
-419    1
-418    1
+152    2
 153    1
-105    1
-69     1
-411    1
-41     1
 155    1
-407    1
 156    1
-87     1
 157    1
-402    1
 158    1
-400    1
-4      1
-66     1
-65     1
 160    1
-64     1
-394    1
-393    1
-392    1
-389    1
-386    1
 162    1
-86     1
-379    1
-378    1
-377    1
-375    1
-374    1
-373    1
-57     1
 163    1
-368    1
-54     1
-366    1
-365    1
-364    1
-362    1
-360    1
-356    1
-53     1
-351    1
+164    2
+165    2
 166    1
+167    3
 168    1
-345    1
-85     1
-11     1
-341    1
-34     1
-339    1
-338    1
-336    1
-335    1
-111    1
-332    1
-497    1
-33     1
+169    4
 17     1
-496    1
-323    1
-495    1
-494    1
 170    1
-493    1
+172    2
+174    2
+175    2
+176    2
 177    1
-315    1
 178    1
-310    1
-96     1
-308    1
-491    1
-306    1
-305    1
-302    1
-30     1
-180    1
-296    1
-292    1
-291    1
-289    1
-98     2
-97     2
-95     2
-84     2
-83     2
-76     2
-72     2
-67     2
-58     2
-51     2
-492    2
-478    2
-463    2
-462    2
-459    2
-458    2
-439    2
-429    2
-424    2
-42     2
-414    2
-413    2
-404    2
-399    2
-397    2
-395    2
-382    2
-37     2
-367    2
-353    2
-344    2
-342    2
-333    2
-331    2
-325    2
-322    2
-321    2
-317    2
-309    2
-307    2
-288    2
-282    2
-281    2
-280    2
-278    2
-272    2
-265    2
-26     2
-256    2
-255    2
-242    2
-24     2
-239    2
-238    2
-237    2
-233    2
-229    2
-224    2
-223    2
-221    2
-219    2
-217    2
-216    2
-213    2
-209    2
-207    2
-205    2
-203    2
-200    2
-197    2
-195    2
-191    2
-18     2
 179    2
-176    2
-175    2
-174    2
-172    2
-165    2
-164    2
-152    2
-15     2
-149    2
-146    2
-137    2
-134    2
-129    2
-125    2
-120    2
-12     2
-118    2
-113    2
-104    2
-103    2
-100    2
-498    3
+18     2
+180    1
+181    1
+183    1
+186    1
+187    3
+189    1
+19     1
+190    1
+191    2
+192    1
+193    3
+194    1
+195    2
+196    1
+197    2
+199    3
+2      1
+20     1
+200    2
+201    1
+202    1
+203    2
+205    2
+207    2
+208    3
+209    2
+213    2
+214    1
+216    2
+217    2
+218    1
+219    2
+221    2
+222    1
+223    2
+224    2
+226    1
+228    1
+229    2
+230    5
+233    2
+235    1
+237    2
+238    2
+239    2
+24     2
+241    1
+242    2
+244    1
+247    1
+248    1
+249    1
+252    1
+255    2
+256    2
+257    1
+258    1
+26     2
+260    1
+262    1
+263    1
+265    2
+266    1
+27     1
+272    2
+273    3
+274    1
+275    1
+277    4
+278    2
+28     1
+280    2
+281    2
+282    2
+283    1
+284    1
+285    1
+286    1
+287    1
+288    2
+289    1
+291    1
+292    1
+296    1
+298    3
+30     1
+302    1
+305    1
+306    1
+307    2
+308    1
+309    2
+310    1
+311    3
+315    1
+316    3
+317    2
+318    3
+321    2
+322    2
+323    1
+325    2
+327    3
+33     1
+331    2
+332    1
+333    2
+335    1
+336    1
+338    1
+339    1
+34     1
+341    1
+342    2
+344    2
+345    1
+348    5
+35     3
+351    1
+353    2
+356    1
+360    1
+362    1
+364    1
+365    1
+366    1
+367    2
+368    1
 369    3
+37     2
+373    1
+374    1
+375    1
+377    1
+378    1
+379    1
+382    2
 384    3
+386    1
+389    1
+392    1
+393    1
+394    1
+395    2
 396    3
+397    2
+399    2
+4      1
+400    1
+401    5
+402    1
 403    3
+404    2
+406    4
+407    1
 409    3
+41     1
+411    1
+413    2
+414    2
 417    3
-5      3
+418    1
+419    1
+42     2
+421    1
+424    2
+427    1
+429    2
+43     1
 430    3
-70     3
-119    3
-0      3
 431    3
+432    1
+435    1
+436    1
+437    1
 438    3
-480    3
-193    3
-199    3
-208    3
-187    3
-273    3
-298    3
+439    2
+44     1
+443    1
+444    1
+446    1
+448    1
+449    1
+452    1
+453    1
 454    3
-311    3
-316    3
+455    1
+457    1
+458    2
+459    2
+460    1
+462    2
+463    2
 466    3
-90     3
-128    3
-318    3
-327    3
-167    3
-35     3
+467    1
 468    4
-489    4
-406    4
-169    4
-138    4
-277    4
 469    5
-401    5
-230    5
-348    5
-PREHOOK: query: -- join query with multiple reduce stages;
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-PREHOOK: type: QUERY
-POSTHOOK: query: -- join query with multiple reduce stages;
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
-        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
-        Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
+47     1
+470    1
+472    1
+475    1
+477    1
+478    2
+479    1
+480    3
+481    1
+482    1
+483    1
+484    1
+485    1
+487    1
+489    4
+490    1
+491    1
+492    2
+493    1
+494    1
+495    1
+496    1
+497    1
+498    3
+5      3
+51     2
+53     1
+54     1
+57     1
+58     2
+64     1
+65     1
+66     1
+67     2
+69     1
+70     3
+72     2
+74     1
+76     2
+77     1
+78     1
+8      1
+80     1
+82     1
+83     2
+84     2
+85     1
+86     1
+87     1
+9      1
+90     3
+92     1
+95     2
+96     1
+97     2
+98     2
+PREHOOK: query: -- join query with multiple reduce stages;
+EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+PREHOOK: type: QUERY
+POSTHOOK: query: -- join query with multiple reduce stages;
+EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
+        Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
                   alias: s1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
@@ -507,739 +511,739 @@ POSTHOOK: query: SELECT s2.key, count(distinct 
s2.value) as cnt FROM src s1 join
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-98     1
-97     1
-96     1
-95     1
-92     1
-90     1
-9      1
-87     1
-86     1
-85     1
-84     1
-83     1
-82     1
-80     1
-8      1
-78     1
-77     1
-76     1
-74     1
-72     1
-70     1
-69     1
-67     1
-66     1
-65     1
-64     1
-58     1
-57     1
-54     1
-53     1
-51     1
-5      1
-498    1
-497    1
-496    1
-495    1
-494    1
-493    1
-492    1
-491    1
-490    1
-489    1
-487    1
-485    1
-484    1
-483    1
-482    1
-481    1
-480    1
-479    1
-478    1
-477    1
-475    1
-472    1
-470    1
-47     1
-469    1
-468    1
-467    1
-466    1
-463    1
-462    1
-460    1
-459    1
-458    1
-457    1
-455    1
-454    1
-453    1
-452    1
-449    1
-448    1
-446    1
-444    1
-443    1
-44     1
-439    1
-438    1
-437    1
-436    1
-435    1
-432    1
-431    1
-430    1
-43     1
-429    1
-427    1
-424    1
-421    1
-42     1
-419    1
-418    1
-417    1
-414    1
-413    1
-411    1
-41     1
-409    1
-407    1
-406    1
-404    1
-403    1
-402    1
-401    1
-400    1
-4      1
-399    1
-397    1
-396    1
-395    1
-394    1
-393    1
-392    1
-389    1
-386    1
-384    1
-382    1
-379    1
-378    1
-377    1
-375    1
-374    1
-373    1
-37     1
-369    1
-368    1
-367    1
-366    1
-365    1
-364    1
-362    1
-360    1
-356    1
-353    1
-351    1
-35     1
-348    1
-345    1
-344    1
-342    1
-341    1
-34     1
-339    1
-338    1
-336    1
-335    1
-333    1
-332    1
-331    1
-33     1
-327    1
-325    1
-323    1
-322    1
-321    1
-318    1
-317    1
-316    1
-315    1
-311    1
-310    1
-309    1
-308    1
-307    1
-306    1
-305    1
-302    1
-30     1
-298    1
-296    1
-292    1
-291    1
-289    1
-288    1
-287    1
-286    1
-285    1
-284    1
-283    1
-282    1
-281    1
-280    1
-28     1
-278    1
-277    1
-275    1
-274    1
-273    1
-272    1
-27     1
-266    1
-265    1
-263    1
-262    1
-260    1
-26     1
-258    1
-257    1
-256    1
-255    1
-252    1
-249    1
-248    1
-247    1
-244    1
-242    1
-241    1
-24     1
-239    1
-238    1
-237    1
-235    1
-233    1
-230    1
-229    1
-228    1
-226    1
-224    1
-223    1
-222    1
-221    1
-219    1
-218    1
-217    1
-216    1
-214    1
-213    1
-209    1
-208    1
-207    1
-205    1
-203    1
-202    1
-201    1
-200    1
-20     1
-2      1
-199    1
-197    1
-196    1
-195    1
-194    1
-193    1
-192    1
-191    1
-190    1
-19     1
-189    1
-187    1
-186    1
-183    1
-181    1
-180    1
-18     1
-179    1
-178    1
-177    1
-176    1
-175    1
-174    1
-172    1
-170    1
-17     1
-169    1
-168    1
-167    1
-166    1
-165    1
-164    1
-163    1
-162    1
-160    1
-158    1
-157    1
-156    1
-155    1
-153    1
-152    1
-150    1
-15     1
-149    1
-146    1
-145    1
-143    1
-138    1
-137    1
-136    1
-134    1
-133    1
-131    1
-129    1
-128    1
-126    1
-125    1
-120    1
-12     1
-119    1
-118    1
-116    1
-114    1
-113    1
-111    1
-11     1
-105    1
-104    1
-103    1
-100    1
-10     1
 0      1
-PREHOOK: query: -- same query with broadcast join
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-PREHOOK: type: QUERY
-POSTHOOK: query: -- same query with broadcast join
-EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-      Edges:
-        Map 1 <- Map 4 (BROADCAST_EDGE)
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: s1
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string), value (type: string)
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                      Map Join Operator
-                        condition map:
-                             Inner Join 0 to 1
-                        keys:
-                          0 _col0 (type: string)
-                          1 _col0 (type: string)
-                        outputColumnNames: _col0, _col1
-                        input vertices:
-                          1 Map 4
-                        Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
-                        Group By Operator
-                          keys: _col0 (type: string), _col1 (type: string)
-                          mode: hash
-                          outputColumnNames: _col0, _col1
-                          Statistics: Num rows: 275 Data size: 2921 Basic 
stats: COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            key expressions: _col0 (type: string), _col1 
(type: string)
-                            sort order: ++
-                            Map-reduce partition columns: _col0 (type: string)
-                            Statistics: Num rows: 275 Data size: 2921 Basic 
stats: COMPLETE Column stats: NONE
-        Map 4 
-            Map Operator Tree:
-                TableScan
-                  alias: s1
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-        Reducer 2 
-            Reduce Operator Tree:
-              Group By Operator
-                keys: KEY._col0 (type: string), KEY._col1 (type: string)
-                mode: mergepartial
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 137 Data size: 1455 Basic stats: 
COMPLETE Column stats: NONE
-                Group By Operator
-                  aggregations: count(_col1)
-                  keys: _col0 (type: string)
-                  mode: complete
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 68 Data size: 722 Basic stats: 
COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col1 (type: bigint)
-                    sort order: +
-                    Statistics: Num rows: 68 Data size: 722 Basic stats: 
COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string)
-        Reducer 3 
-            Reduce Operator Tree:
-              Select Operator
-                expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 
(type: bigint)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 68 Data size: 722 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 68 Data size: 722 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: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 
join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 
join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-#### A masked pattern was here ####
-98     1
-97     1
-96     1
-95     1
-92     1
-90     1
-9      1
-87     1
-86     1
-85     1
-84     1
-83     1
-82     1
-80     1
-8      1
-78     1
-77     1
-76     1
-74     1
-72     1
-70     1
-69     1
-67     1
-66     1
-65     1
-64     1
-58     1
-57     1
-54     1
-53     1
-51     1
-5      1
-498    1
-497    1
-496    1
-495    1
-494    1
-493    1
-492    1
-491    1
-490    1
-489    1
-487    1
-485    1
-484    1
-483    1
-482    1
-481    1
-480    1
-479    1
-478    1
-477    1
-475    1
-472    1
-470    1
-47     1
-469    1
-468    1
-467    1
-466    1
-463    1
-462    1
-460    1
-459    1
-458    1
-457    1
-455    1
-454    1
-453    1
-452    1
-449    1
-448    1
-446    1
-444    1
-443    1
-44     1
-439    1
-438    1
-437    1
-436    1
-435    1
-432    1
-431    1
-430    1
-43     1
-429    1
-427    1
-424    1
-421    1
-42     1
-419    1
-418    1
-417    1
-414    1
-413    1
-411    1
-41     1
-409    1
-407    1
-406    1
-404    1
-403    1
-402    1
-401    1
-400    1
-4      1
-399    1
-397    1
-396    1
-395    1
-394    1
-393    1
-392    1
-389    1
-386    1
-384    1
-382    1
-379    1
-378    1
-377    1
-375    1
-374    1
-373    1
-37     1
-369    1
-368    1
-367    1
-366    1
-365    1
-364    1
-362    1
-360    1
-356    1
-353    1
-351    1
-35     1
-348    1
-345    1
-344    1
-342    1
-341    1
-34     1
-339    1
-338    1
-336    1
-335    1
-333    1
-332    1
-331    1
-33     1
-327    1
-325    1
-323    1
-322    1
-321    1
-318    1
-317    1
-316    1
-315    1
-311    1
-310    1
-309    1
-308    1
-307    1
-306    1
-305    1
-302    1
-30     1
-298    1
-296    1
-292    1
-291    1
-289    1
-288    1
-287    1
-286    1
-285    1
-284    1
-283    1
-282    1
-281    1
-280    1
-28     1
-278    1
-277    1
-275    1
-274    1
-273    1
-272    1
-27     1
-266    1
-265    1
-263    1
-262    1
-260    1
-26     1
-258    1
-257    1
-256    1
-255    1
-252    1
-249    1
-248    1
-247    1
-244    1
-242    1
-241    1
-24     1
-239    1
-238    1
-237    1
-235    1
-233    1
-230    1
-229    1
-228    1
-226    1
-224    1
-223    1
-222    1
-221    1
-219    1
-218    1
-217    1
-216    1
-214    1
-213    1
-209    1
-208    1
-207    1
-205    1
-203    1
-202    1
-201    1
-200    1
-20     1
-2      1
-199    1
-197    1
-196    1
-195    1
-194    1
-193    1
-192    1
-191    1
-190    1
-19     1
-189    1
-187    1
-186    1
-183    1
-181    1
-180    1
-18     1
-179    1
-178    1
-177    1
-176    1
-175    1
-174    1
-172    1
-170    1
-17     1
-169    1
-168    1
-167    1
-166    1
-165    1
-164    1
-163    1
-162    1
-160    1
-158    1
-157    1
-156    1
-155    1
-153    1
-152    1
-150    1
-15     1
-149    1
-146    1
-145    1
-143    1
-138    1
-137    1
-136    1
-134    1
-133    1
-131    1
-129    1
-128    1
-126    1
-125    1
-120    1
-12     1
-119    1
-118    1
-116    1
-114    1
-113    1
-111    1
-11     1
-105    1
-104    1
-103    1
-100    1
 10     1
+100    1
+103    1
+104    1
+105    1
+11     1
+111    1
+113    1
+114    1
+116    1
+118    1
+119    1
+12     1
+120    1
+125    1
+126    1
+128    1
+129    1
+131    1
+133    1
+134    1
+136    1
+137    1
+138    1
+143    1
+145    1
+146    1
+149    1
+15     1
+150    1
+152    1
+153    1
+155    1
+156    1
+157    1
+158    1
+160    1
+162    1
+163    1
+164    1
+165    1
+166    1
+167    1
+168    1
+169    1
+17     1
+170    1
+172    1
+174    1
+175    1
+176    1
+177    1
+178    1
+179    1
+18     1
+180    1
+181    1
+183    1
+186    1
+187    1
+189    1
+19     1
+190    1
+191    1
+192    1
+193    1
+194    1
+195    1
+196    1
+197    1
+199    1
+2      1
+20     1
+200    1
+201    1
+202    1
+203    1
+205    1
+207    1
+208    1
+209    1
+213    1
+214    1
+216    1
+217    1
+218    1
+219    1
+221    1
+222    1
+223    1
+224    1
+226    1
+228    1
+229    1
+230    1
+233    1
+235    1
+237    1
+238    1
+239    1
+24     1
+241    1
+242    1
+244    1
+247    1
+248    1
+249    1
+252    1
+255    1
+256    1
+257    1
+258    1
+26     1
+260    1
+262    1
+263    1
+265    1
+266    1
+27     1
+272    1
+273    1
+274    1
+275    1
+277    1
+278    1
+28     1
+280    1
+281    1
+282    1
+283    1
+284    1
+285    1
+286    1
+287    1
+288    1
+289    1
+291    1
+292    1
+296    1
+298    1
+30     1
+302    1
+305    1
+306    1
+307    1
+308    1
+309    1
+310    1
+311    1
+315    1
+316    1
+317    1
+318    1
+321    1
+322    1
+323    1
+325    1
+327    1
+33     1
+331    1
+332    1
+333    1
+335    1
+336    1
+338    1
+339    1
+34     1
+341    1
+342    1
+344    1
+345    1
+348    1
+35     1
+351    1
+353    1
+356    1
+360    1
+362    1
+364    1
+365    1
+366    1
+367    1
+368    1
+369    1
+37     1
+373    1
+374    1
+375    1
+377    1
+378    1
+379    1
+382    1
+384    1
+386    1
+389    1
+392    1
+393    1
+394    1
+395    1
+396    1
+397    1
+399    1
+4      1
+400    1
+401    1
+402    1
+403    1
+404    1
+406    1
+407    1
+409    1
+41     1
+411    1
+413    1
+414    1
+417    1
+418    1
+419    1
+42     1
+421    1
+424    1
+427    1
+429    1
+43     1
+430    1
+431    1
+432    1
+435    1
+436    1
+437    1
+438    1
+439    1
+44     1
+443    1
+444    1
+446    1
+448    1
+449    1
+452    1
+453    1
+454    1
+455    1
+457    1
+458    1
+459    1
+460    1
+462    1
+463    1
+466    1
+467    1
+468    1
+469    1
+47     1
+470    1
+472    1
+475    1
+477    1
+478    1
+479    1
+480    1
+481    1
+482    1
+483    1
+484    1
+485    1
+487    1
+489    1
+490    1
+491    1
+492    1
+493    1
+494    1
+495    1
+496    1
+497    1
+498    1
+5      1
+51     1
+53     1
+54     1
+57     1
+58     1
+64     1
+65     1
+66     1
+67     1
+69     1
+70     1
+72     1
+74     1
+76     1
+77     1
+78     1
+8      1
+80     1
+82     1
+83     1
+84     1
+85     1
+86     1
+87     1
+9      1
+90     1
+92     1
+95     1
+96     1
+97     1
+98     1
+PREHOOK: query: -- same query with broadcast join
+EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+PREHOOK: type: QUERY
+POSTHOOK: query: -- same query with broadcast join
+EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 
on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+      Edges:
+        Map 1 <- Map 4 (BROADCAST_EDGE)
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: s1
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: key (type: string), value (type: string)
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: string)
+                          1 _col0 (type: string)
+                        outputColumnNames: _col0, _col1
+                        input vertices:
+                          1 Map 4
+                        Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
+                        HybridGraceHashJoin: true
+                        Group By Operator
+                          keys: _col0 (type: string), _col1 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0, _col1
+                          Statistics: Num rows: 275 Data size: 2921 Basic 
stats: COMPLETE Column stats: NONE
+                          Reduce Output Operator
+                            key expressions: _col0 (type: string), _col1 
(type: string)
+                            sort order: ++
+                            Map-reduce partition columns: _col0 (type: string)
+                            Statistics: Num rows: 275 Data size: 2921 Basic 
stats: COMPLETE Column stats: NONE
+        Map 4 
+            Map Operator Tree:
+                TableScan
+                  alias: s1
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
+                        Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+        Reducer 2 
+            Reduce Operator Tree:
+              Group By Operator
+                keys: KEY._col0 (type: string), KEY._col1 (type: string)
+                mode: mergepartial
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 137 Data size: 1455 Basic stats: 
COMPLETE Column stats: NONE
+                Group By Operator
+                  aggregations: count(_col1)
+                  keys: _col0 (type: string)
+                  mode: complete
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 68 Data size: 722 Basic stats: 
COMPLETE Column stats: NONE
+                  Reduce Output Operator
+                    key expressions: _col1 (type: bigint)
+                    sort order: +
+                    Statistics: Num rows: 68 Data size: 722 Basic stats: 
COMPLETE Column stats: NONE
+                    value expressions: _col0 (type: string)
+        Reducer 3 
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 
(type: bigint)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 68 Data size: 722 Basic stats: COMPLETE 
Column stats: NONE
+                File Output Operator
+                  compressed: false
+                  Statistics: Num rows: 68 Data size: 722 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: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 
join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 
join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 0      1
+10     1
+100    1
+103    1
+104    1
+105    1
+11     1
+111    1
+113    1
+114    1
+116    1
+118    1
+119    1
+12     1
+120    1
+125    1
+126    1
+128    1
+129    1
+131    1
+133    1
+134    1
+136    1
+137    1
+138    1
+143    1
+145    1
+146    1
+149    1
+15     1
+150    1
+152    1
+153    1
+155    1
+156    1
+157    1
+158    1
+160    1
+162    1
+163    1
+164    1
+165    1
+166    1
+167    1
+168    1
+169    1
+17     1
+170    1
+172    1
+174    1
+175    1
+176    1
+177    1
+178    1
+179    1
+18     1
+180    1
+181    1
+183    1
+186    1
+187    1
+189    1
+19     1
+190    1
+191    1
+192    1
+193    1
+194    1
+195    1
+196    1
+197    1
+199    1
+2      1
+20     1
+200    1
+201    1
+202    1
+203    1
+205    1
+207    1
+208    1
+209    1
+213    1
+214    1
+216    1
+217    1
+218    1
+219    1
+221    1
+222    1
+223    1
+224    1
+226    1
+228    1
+229    1
+230    1
+233    1
+235    1
+237    1
+238    1
+239    1
+24     1
+241    1
+242    1
+244    1
+247    1
+248    1
+249    1
+252    1
+255    1
+256    1
+257    1
+258    1
+26     1
+260    1
+262    1
+263    1
+265    1
+266    1
+27     1
+272    1
+273    1
+274    1
+275    1
+277    1
+278    1
+28     1
+280    1
+281    1
+282    1
+283    1
+284    1
+285    1
+286    1
+287    1
+288    1
+289    1
+291    1
+292    1
+296    1
+298    1
+30     1
+302    1
+305    1
+306    1
+307    1
+308    1
+309    1
+310    1
+311    1
+315    1
+316    1
+317    1
+318    1
+321    1
+322    1
+323    1
+325    1
+327    1
+33     1
+331    1
+332    1
+333    1
+335    1
+336    1
+338    1
+339    1
+34     1
+341    1
+342    1
+344    1
+345    1
+348    1
+35     1
+351    1
+353    1
+356    1
+360    1
+362    1
+364    1
+365    1
+366    1
+367    1
+368    1
+369    1
+37     1
+373    1
+374    1
+375    1
+377    1
+378    1
+379    1
+382    1
+384    1
+386    1
+389    1
+392    1
+393    1
+394    1
+395    1
+396    1
+397    1
+399    1
+4      1
+400    1
+401    1
+402    1
+403    1
+404    1
+406    1
+407    1
+409    1
+41     1
+411    1
+413    1
+414    1
+417    1
+418    1
+419    1
+42     1
+421    1
+424    1
+427    1
+429    1
+43     1
+430    1
+431    1
+432    1
+435    1
+436    1
+437    1
+438    1
+439    1
+44     1
+443    1
+444    1
+446    1
+448    1
+449    1
+452    1
+453    1
+454    1
+455    1
+457    1
+458    1
+459    1
+460    1
+462    1
+463    1
+466    1
+467    1
+468    1
+469    1
+47     1
+470    1
+472    1
+475    1
+477    1
+478    1
+479    1
+480    1
+481    1
+482    1
+483    1
+484    1
+485    1
+487    1
+489    1
+490    1
+491    1
+492    1
+493    1
+494    1
+495    1
+496    1
+497    1
+498    1
+5      1
+51     1
+53     1
+54     1
+57     1
+58     1
+64     1
+65     1
+66     1
+67     1
+69     1
+70     1
+72     1
+74     1
+76     1
+77     1
+78     1
+8      1
+80     1
+82     1
+83     1
+84     1
+85     1
+86     1
+87     1
+9      1
+90     1
+92     1
+95     1
+96     1
+97     1
+98     1
 PREHOOK: query: -- query with multiple branches in the task dag
 EXPLAIN
 SELECT * 

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/orc_merge1.q.out 
b/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
index 3fffb4e..77ea36a 100644
--- a/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
+++ b/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
@@ -1,6 +1,10 @@
-PREHOOK: query: DROP TABLE orcfile_merge1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE orcfile_merge1
 PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+DROP TABLE orcfile_merge1
 POSTHOOK: type: DROPTABLE
 PREHOOK: query: DROP TABLE orcfile_merge1b
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/script_env_var1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/script_env_var1.q.out 
b/ql/src/test/results/clientpositive/tez/script_env_var1.q.out
index 5ab1c20..cd39eb8 100644
--- a/ql/src/test/results/clientpositive/tez/script_env_var1.q.out
+++ b/ql/src/test/results/clientpositive/tez/script_env_var1.q.out
@@ -1,16 +1,16 @@
 PREHOOK: query: -- Verifies that script operator ID environment variables have 
unique values
 -- in each instance of the script operator.
 SELECT count(1) FROM
-( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src LIMIT 1)x UNION ALL
-  SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src LIMIT 1)y ) a GROUP BY key
+( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src order by key LIMIT 1)x UNION ALL
+  SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src order by key LIMIT 1)y ) a GROUP BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
 POSTHOOK: query: -- Verifies that script operator ID environment variables 
have unique values
 -- in each instance of the script operator.
 SELECT count(1) FROM
-( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src LIMIT 1)x UNION ALL
-  SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src LIMIT 1)y ) a GROUP BY key
+( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src order by key LIMIT 1)x UNION ALL
+  SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' 
AS key FROM src order by key LIMIT 1)y ) a GROUP BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out 
b/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out
index 2bccb8f..59c8f2a 100644
--- a/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out
+++ b/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out
@@ -1,6 +1,10 @@
-PREHOOK: query: explain select distinct src.* from src
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select distinct src.* from src
 PREHOOK: type: QUERY
-POSTHOOK: query: explain select distinct src.* from src
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select distinct src.* from src
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -1419,6 +1423,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+       
+       val_165
+       val_193
+       val_265
+       val_27
+       val_409
+       val_484
 0      val_0
 10     val_10
 100    val_100
@@ -1436,6 +1447,7 @@ POSTHOOK: Input: default@src1
 120    val_120
 125    val_125
 126    val_126
+128    
 128    val_128
 129    val_129
 131    val_131
@@ -1447,9 +1459,11 @@ POSTHOOK: Input: default@src1
 143    val_143
 145    val_145
 146    val_146
+146    val_146
 149    val_149
 15     val_15
 150    val_150
+150    val_150
 152    val_152
 153    val_153
 155    val_155
@@ -1502,6 +1516,7 @@ POSTHOOK: Input: default@src1
 208    val_208
 209    val_209
 213    val_213
+213    val_213
 214    val_214
 216    val_216
 217    val_217
@@ -1510,6 +1525,7 @@ POSTHOOK: Input: default@src1
 221    val_221
 222    val_222
 223    val_223
+224    
 224    val_224
 226    val_226
 228    val_228
@@ -1519,6 +1535,7 @@ POSTHOOK: Input: default@src1
 235    val_235
 237    val_237
 238    val_238
+238    val_238
 239    val_239
 24     val_24
 241    val_241
@@ -1529,6 +1546,7 @@ POSTHOOK: Input: default@src1
 249    val_249
 252    val_252
 255    val_255
+255    val_255
 256    val_256
 257    val_257
 258    val_258
@@ -1541,10 +1559,12 @@ POSTHOOK: Input: default@src1
 27     val_27
 272    val_272
 273    val_273
+273    val_273
 274    val_274
 275    val_275
 277    val_277
 278    val_278
+278    val_278
 28     val_28
 280    val_280
 281    val_281
@@ -1569,6 +1589,7 @@ POSTHOOK: Input: default@src1
 309    val_309
 310    val_310
 311    val_311
+311    val_311
 315    val_315
 316    val_316
 317    val_317
@@ -1603,6 +1624,7 @@ POSTHOOK: Input: default@src1
 366    val_366
 367    val_367
 368    val_368
+369    
 369    val_369
 37     val_37
 373    val_373
@@ -1625,10 +1647,12 @@ POSTHOOK: Input: default@src1
 4      val_4
 400    val_400
 401    val_401
+401    val_401
 402    val_402
 403    val_403
 404    val_404
 406    val_406
+406    val_406
 407    val_407
 409    val_409
 41     val_41
@@ -1705,6 +1729,7 @@ POSTHOOK: Input: default@src1
 64     val_64
 65     val_65
 66     val_66
+66     val_66
 67     val_67
 69     val_69
 70     val_70
@@ -1728,27 +1753,6 @@ POSTHOOK: Input: default@src1
 96     val_96
 97     val_97
 98     val_98
-       
-       val_165
-       val_193
-       val_265
-       val_27
-       val_409
-       val_484
-128    
-146    val_146
-150    val_150
-213    val_213
-224    
-238    val_238
-255    val_255
-273    val_273
-278    val_278
-311    val_311
-369    
-401    val_401
-406    val_406
-66     val_66
 98     val_98
 PREHOOK: query: select distinct * from src join src1 on src.key=src1.key
 PREHOOK: type: QUERY
@@ -3870,6 +3874,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+       
+       val_165
+       val_193
+       val_265
+       val_27
+       val_409
+       val_484
 0      val_0
 10     val_10
 100    val_100
@@ -3887,6 +3898,7 @@ POSTHOOK: Input: default@src1
 120    val_120
 125    val_125
 126    val_126
+128    
 128    val_128
 129    val_129
 131    val_131
@@ -3898,9 +3910,11 @@ POSTHOOK: Input: default@src1
 143    val_143
 145    val_145
 146    val_146
+146    val_146
 149    val_149
 15     val_15
 150    val_150
+150    val_150
 152    val_152
 153    val_153
 155    val_155
@@ -3953,6 +3967,7 @@ POSTHOOK: Input: default@src1
 208    val_208
 209    val_209
 213    val_213
+213    val_213
 214    val_214
 216    val_216
 217    val_217
@@ -3961,6 +3976,7 @@ POSTHOOK: Input: default@src1
 221    val_221
 222    val_222
 223    val_223
+224    
 224    val_224
 226    val_226
 228    val_228
@@ -3970,6 +3986,7 @@ POSTHOOK: Input: default@src1
 235    val_235
 237    val_237
 238    val_238
+238    val_238
 239    val_239
 24     val_24
 241    val_241
@@ -3980,6 +3997,7 @@ POSTHOOK: Input: default@src1
 249    val_249
 252    val_252
 255    val_255
+255    val_255
 256    val_256
 257    val_257
 258    val_258
@@ -3992,10 +4010,12 @@ POSTHOOK: Input: default@src1
 27     val_27
 272    val_272
 273    val_273
+273    val_273
 274    val_274
 275    val_275
 277    val_277
 278    val_278
+278    val_278
 28     val_28
 280    val_280
 281    val_281
@@ -4020,6 +4040,7 @@ POSTHOOK: Input: default@src1
 309    val_309
 310    val_310
 311    val_311
+311    val_311
 315    val_315
 316    val_316
 317    val_317
@@ -4054,6 +4075,7 @@ POSTHOOK: Input: default@src1
 366    val_366
 367    val_367
 368    val_368
+369    
 369    val_369
 37     val_37
 373    val_373
@@ -4076,10 +4098,12 @@ POSTHOOK: Input: default@src1
 4      val_4
 400    val_400
 401    val_401
+401    val_401
 402    val_402
 403    val_403
 404    val_404
 406    val_406
+406    val_406
 407    val_407
 409    val_409
 41     val_41
@@ -4156,6 +4180,7 @@ POSTHOOK: Input: default@src1
 64     val_64
 65     val_65
 66     val_66
+66     val_66
 67     val_67
 69     val_69
 70     val_70
@@ -4179,27 +4204,6 @@ POSTHOOK: Input: default@src1
 96     val_96
 97     val_97
 98     val_98
-       
-       val_165
-       val_193
-       val_265
-       val_27
-       val_409
-       val_484
-128    
-146    val_146
-150    val_150
-213    val_213
-224    
-238    val_238
-255    val_255
-273    val_273
-278    val_278
-311    val_311
-369    
-401    val_401
-406    val_406
-66     val_66
 98     val_98
 PREHOOK: query: select distinct * from src join src1 on src.key=src1.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/skewjoin.q.out 
b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
index 7923d15..ec368f9 100644
--- a/ql/src/test/results/clientpositive/tez/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/skewjoin.q.out
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@T1
-POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@T1

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out 
b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
index f4e8df1..503a5e9 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
@@ -1,6 +1,7 @@
 PREHOOK: query: -- SORT_QUERY_RESULTS
 
 -- no agg, corr
+-- SORT_QUERY_RESULTS
 explain
 select * 
 from src b 
@@ -13,6 +14,7 @@ PREHOOK: type: QUERY
 POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 -- no agg, corr
+-- SORT_QUERY_RESULTS
 explain
 select * 
 from src b 

http://git-wip-us.apache.org/repos/asf/hive/blob/6fdd9cdd/ql/src/test/results/clientpositive/tez/temp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/temp_table.q.out 
b/ql/src/test/results/clientpositive/tez/temp_table.q.out
index 1055a22..89c1784 100644
--- a/ql/src/test/results/clientpositive/tez/temp_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/temp_table.q.out
@@ -154,45 +154,76 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@bar
 key                    string                                      
 value                  string                                      
-PREHOOK: query: explain select * from foo limit 10
+PREHOOK: query: explain select * from foo order by key limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: explain select * from foo limit 10
+POSTHOOK: query: explain select * from foo order by key limit 10
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-0 is a root stage
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
+  Stage: Stage-1
+    Tez
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: foo
+                  Statistics: Num rows: 247 Data size: 2609 Basic stats: 
COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: key (type: string), value (type: string)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 247 Data size: 2609 Basic stats: 
COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: _col0 (type: string)
+                      sort order: +
+                      Statistics: Num rows: 247 Data size: 2609 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
+        Reducer 2 
+            Reduce Operator Tree:
+              Select Operator
+                expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 
(type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 247 Data size: 2609 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
+
   Stage: Stage-0
     Fetch Operator
       limit: 10
       Processor Tree:
-        TableScan
-          alias: foo
-          Select Operator
-            expressions: key (type: string), value (type: string)
-            outputColumnNames: _col0, _col1
-            Limit
-              Number of rows: 10
-              ListSink
+        ListSink
 
-PREHOOK: query: select * from foo limit 10
+PREHOOK: query: select * from foo order by key limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@foo
 #### A masked pattern was here ####
-POSTHOOK: query: select * from foo limit 10
+POSTHOOK: query: select * from foo order by key limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@foo
 #### A masked pattern was here ####
-238    val_238
-86     val_86
-278    val_278
-98     val_98
-484    val_484
-150    val_150
-224    val_224
-66     val_66
-128    val_128
-146    val_146
+0      val_0
+0      val_0
+0      val_0
+10     val_10
+100    val_100
+100    val_100
+104    val_104
+104    val_104
+114    val_114
+116    val_116
 PREHOOK: query: explain select * from (select * from foo union all select * 
from bar) u order by key limit 10
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from (select * from foo union all select * 
from bar) u order by key limit 10
@@ -327,11 +358,11 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@bay
 POSTHOOK: Lineage: bay.key SIMPLE [(src)src.FieldSchema(name:key, type:string, 
comment:default), ]
 POSTHOOK: Lineage: bay.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: select * from bay limit 10
+PREHOOK: query: select * from bay order by key limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bay
 #### A masked pattern was here ####
-POSTHOOK: query: select * from bay limit 10
+POSTHOOK: query: select * from bay order by key limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bay
 #### A masked pattern was here ####

Reply via email to