hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcama...@apache.org
Subject [8/9] hive git commit: HIVE-13982: Extensions to RS dedup: execute with different column order and sorting direction if possible (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)
Date Sun, 26 Jun 2016 02:17:55 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/limit_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown2.q.out b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
new file mode 100644
index 0000000..2f68674
--- /dev/null
+++ b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
@@ -0,0 +1,804 @@
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key, value limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key, value limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: key (type: string), value (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col0 (type: string), _col1 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key, value limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key, value limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+0	val_0	1.0
+10	val_10	11.0
+100	val_100	101.0
+103	val_103	104.0
+104	val_104	105.0
+105	val_105	106.0
+11	val_11	12.0
+111	val_111	112.0
+113	val_113	114.0
+114	val_114	115.0
+116	val_116	117.0
+118	val_118	119.0
+119	val_119	120.0
+12	val_12	13.0
+120	val_120	121.0
+125	val_125	126.0
+126	val_126	127.0
+128	val_128	129.0
+129	val_129	130.0
+131	val_131	132.0
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key, value desc limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key, value desc limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: key (type: string), value (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col0 (type: string), _col1 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key, value desc limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key, value desc limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+0	val_0	1.0
+10	val_10	11.0
+100	val_100	101.0
+103	val_103	104.0
+104	val_104	105.0
+105	val_105	106.0
+11	val_11	12.0
+111	val_111	112.0
+113	val_113	114.0
+114	val_114	115.0
+116	val_116	117.0
+118	val_118	119.0
+119	val_119	120.0
+12	val_12	13.0
+120	val_120	121.0
+125	val_125	126.0
+126	val_126	127.0
+128	val_128	129.0
+129	val_129	130.0
+131	val_131	132.0
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key desc, value limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by key, value
+order by key desc, value limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: key (type: string), value (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col0 (type: string), _col1 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key desc, value limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by key, value
+order by key desc, value limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+98	val_98	99.0
+97	val_97	98.0
+96	val_96	97.0
+95	val_95	96.0
+92	val_92	93.0
+90	val_90	91.0
+9	val_9	10.0
+87	val_87	88.0
+86	val_86	87.0
+85	val_85	86.0
+84	val_84	85.0
+83	val_83	84.0
+82	val_82	83.0
+80	val_80	81.0
+8	val_8	9.0
+78	val_78	79.0
+77	val_77	78.0
+76	val_76	77.0
+74	val_74	75.0
+72	val_72	73.0
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key, value limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key, value limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: value (type: string), key (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col1 (type: string), _col0 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key, value limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key, value limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+0	val_0	1.0
+10	val_10	11.0
+100	val_100	101.0
+103	val_103	104.0
+104	val_104	105.0
+105	val_105	106.0
+11	val_11	12.0
+111	val_111	112.0
+113	val_113	114.0
+114	val_114	115.0
+116	val_116	117.0
+118	val_118	119.0
+119	val_119	120.0
+12	val_12	13.0
+120	val_120	121.0
+125	val_125	126.0
+126	val_126	127.0
+128	val_128	129.0
+129	val_129	130.0
+131	val_131	132.0
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key desc, value limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key desc, value limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: value (type: string), key (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col1 (type: string), _col0 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key desc, value limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key desc, value limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+98	val_98	99.0
+97	val_97	98.0
+96	val_96	97.0
+95	val_95	96.0
+92	val_92	93.0
+90	val_90	91.0
+9	val_9	10.0
+87	val_87	88.0
+86	val_86	87.0
+85	val_85	86.0
+84	val_84	85.0
+83	val_83	84.0
+82	val_82	83.0
+80	val_80	81.0
+8	val_8	9.0
+78	val_78	79.0
+77	val_77	78.0
+76	val_76	77.0
+74	val_74	75.0
+72	val_72	73.0
+PREHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key desc limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select key, value, avg(key + 1) from src
+group by value, key
+order by key desc limit 20
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: value (type: string), key (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                keys: _col1 (type: string), _col0 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 500 Data size: 5312 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), _col1 (type: string)
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
+                  value expressions: _col2 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key desc limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by value, key
+order by key desc limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+98	val_98	99.0
+97	val_97	98.0
+96	val_96	97.0
+95	val_95	96.0
+92	val_92	93.0
+90	val_90	91.0
+9	val_9	10.0
+87	val_87	88.0
+86	val_86	87.0
+85	val_85	86.0
+84	val_84	85.0
+83	val_83	84.0
+82	val_82	83.0
+80	val_80	81.0
+8	val_8	9.0
+78	val_78	79.0
+77	val_77	78.0
+76	val_76	77.0
+74	val_74	75.0
+72	val_72	73.0
+PREHOOK: query: -- NOT APPLICABLE
+explain
+select value, avg(key + 1) myavg from src
+group by value
+order by myavg, value desc limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: -- NOT APPLICABLE
+explain
+select value, avg(key + 1) myavg from src
+group by value
+order by myavg, value desc limit 20
+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 PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: value (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col1)
+                keys: _col0 (type: string)
+                mode: hash
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 500 Data size: 5312 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: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1
+          Statistics: Num rows: 250 Data size: 2656 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: _col1 (type: double), _col0 (type: string)
+              sort order: +-
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+              TopN Hash Memory Usage: 0.3
+      Reduce Operator Tree:
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 (type: double)
+          outputColumnNames: _col0, _col1
+          Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select value, avg(key + 1) myavg from src
+group by value
+order by myavg, value desc limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select value, avg(key + 1) myavg from src
+group by value
+order by myavg, value desc limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+val_0	1.0
+val_2	3.0
+val_4	5.0
+val_5	6.0
+val_8	9.0
+val_9	10.0
+val_10	11.0
+val_11	12.0
+val_12	13.0
+val_15	16.0
+val_17	18.0
+val_18	19.0
+val_19	20.0
+val_20	21.0
+val_24	25.0
+val_26	27.0
+val_27	28.0
+val_28	29.0
+val_30	31.0
+val_33	34.0
+PREHOOK: query: -- NOT APPLICABLE
+explain
+select key, value, avg(key + 1) from src
+group by value, key with rollup
+order by key, value limit 20
+PREHOOK: type: QUERY
+POSTHOOK: query: -- NOT APPLICABLE
+explain
+select key, value, avg(key + 1) from src
+group by value, key with rollup
+order by key, value limit 20
+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 PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Select Operator
+              expressions: value (type: string), key (type: string), (UDFToDouble(key) + 1.0) (type: double)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Group By Operator
+                aggregations: avg(_col2)
+                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
+                Reduce Output Operator
+                  key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                  sort order: +++
+                  Map-reduce partition columns: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                  Statistics: Num rows: 1500 Data size: 15936 Basic stats: COMPLETE Column stats: NONE
+                  value expressions: _col3 (type: struct<count:bigint,sum:double,input:double>)
+      Reduce Operator Tree:
+        Group By Operator
+          aggregations: avg(VALUE._col0)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string)
+          mode: mergepartial
+          outputColumnNames: _col0, _col1, _col3
+          Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
+          pruneGroupingSetId: true
+          Select Operator
+            expressions: _col1 (type: string), _col0 (type: string), _col3 (type: double)
+            outputColumnNames: _col0, _col1, _col2
+            Statistics: Num rows: 750 Data size: 7968 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), _col1 (type: string)
+              sort order: ++
+              Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
+              TopN Hash Memory Usage: 0.3
+              value expressions: _col2 (type: double)
+      Reduce Operator Tree:
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: double)
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
+          Limit
+            Number of rows: 20
+            Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: 20
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select key, value, avg(key + 1) from src
+group by value, key with rollup
+order by key, value limit 20
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select key, value, avg(key + 1) from src
+group by value, key with rollup
+order by key, value limit 20
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+NULL	NULL	261.182
+NULL	val_0	1.0
+NULL	val_10	11.0
+NULL	val_100	101.0
+NULL	val_103	104.0
+NULL	val_104	105.0
+NULL	val_105	106.0
+NULL	val_11	12.0
+NULL	val_111	112.0
+NULL	val_113	114.0
+NULL	val_114	115.0
+NULL	val_116	117.0
+NULL	val_118	119.0
+NULL	val_119	120.0
+NULL	val_12	13.0
+NULL	val_120	121.0
+NULL	val_125	126.0
+NULL	val_126	127.0
+NULL	val_128	129.0
+NULL	val_129	130.0

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/limit_pushdown3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown3.q.out b/ql/src/test/results/clientpositive/limit_pushdown3.q.out
index 215cd89..8ccda6a 100644
--- a/ql/src/test/results/clientpositive/limit_pushdown3.q.out
+++ b/ql/src/test/results/clientpositive/limit_pushdown3.q.out
@@ -512,6 +512,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: tinyint)
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(DISTINCT KEY._col1:0._col0)
@@ -732,6 +733,7 @@ STAGE PLANS:
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: tinyint)
                   Statistics: Num rows: 12288 Data size: 2641964 Basic stats: COMPLETE Column stats: NONE
+                  TopN Hash Memory Usage: 0.3
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(DISTINCT KEY._col1:0._col0), count(DISTINCT KEY._col1:1._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/merge_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/merge_join_1.q.out b/ql/src/test/results/clientpositive/merge_join_1.q.out
index 060562d..4d2c4cf 100644
--- a/ql/src/test/results/clientpositive/merge_join_1.q.out
+++ b/ql/src/test/results/clientpositive/merge_join_1.q.out
@@ -102,9 +102,9 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string)
+                  key expressions: _col1 (type: string), _col0 (type: string)
                   sort order: ++
-                  Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
+                  Map-reduce partition columns: _col1 (type: string), _col0 (type: string)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -112,7 +112,7 @@ STAGE PLANS:
                Inner Join 0 to 1
           keys:
             0 _col0 (type: string), _col0 (type: string)
-            1 _col0 (type: string), _col1 (type: string)
+            1 _col1 (type: string), _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
           File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query17.q.out b/ql/src/test/results/clientpositive/perf/query17.q.out
index 3692a9a..39210f7 100644
--- a/ql/src/test/results/clientpositive/perf/query17.q.out
+++ b/ql/src/test/results/clientpositive/perf/query17.q.out
@@ -102,10 +102,10 @@ Stage-0
                                             SHUFFLE [RS_24]
                                               PartitionCols:_col0
                                               Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
-                                                Conds:RS_21._col2, _col1, _col4=RS_22._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                                Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
                                               <-Map 13 [SIMPLE_EDGE]
                                                 SHUFFLE [RS_22]
-                                                  PartitionCols:_col2, _col1, _col3
+                                                  PartitionCols:_col1, _col2, _col3
                                                   Select Operator [SEL_11] (rows=57591150 width=77)
                                                     Output:["_col0","_col1","_col2","_col3","_col4"]
                                                     Filter Operator [FIL_89] (rows=57591150 width=77)
@@ -114,7 +114,7 @@ Stage-0
                                                         default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
                                               <-Map 8 [SIMPLE_EDGE]
                                                 SHUFFLE [RS_21]
-                                                  PartitionCols:_col2, _col1, _col4
+                                                  PartitionCols:_col1, _col2, _col4
                                                   Select Operator [SEL_8] (rows=575995635 width=88)
                                                     Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                     Filter Operator [FIL_88] (rows=575995635 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query19.q.out b/ql/src/test/results/clientpositive/perf/query19.q.out
index f5eeae4..0ddcd83 100644
--- a/ql/src/test/results/clientpositive/perf/query19.q.out
+++ b/ql/src/test/results/clientpositive/perf/query19.q.out
@@ -25,95 +25,97 @@ Stage-0
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 4 [SIMPLE_EDGE]
             SHUFFLE [RS_42]
-              Group By Operator [GBY_39] (rows=421657640 width=88)
-                Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
-              <-Reducer 3 [SIMPLE_EDGE]
-                SHUFFLE [RS_38]
-                  PartitionCols:_col0, _col1, _col2, _col3
-                  Group By Operator [GBY_37] (rows=843315281 width=88)
-                    Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col7)"],keys:_col9, _col10, _col11, _col12
-                    Select Operator [SEL_36] (rows=843315281 width=88)
-                      Output:["_col9","_col10","_col11","_col12","_col7"]
-                      Filter Operator [FIL_35] (rows=843315281 width=88)
-                        predicate:(substr(_col17, 1, 5) <> substr(_col19, 1, 5))
-                        Select Operator [SEL_34] (rows=843315281 width=88)
-                          Output:["_col7","_col9","_col10","_col11","_col12","_col17","_col19"]
-                          Merge Join Operator [MERGEJOIN_73] (rows=843315281 width=88)
-                            Conds:RS_31._col0=RS_32._col2(Inner),Output:["_col3","_col8","_col13","_col14","_col15","_col16","_col19"]
-                          <-Reducer 10 [SIMPLE_EDGE]
-                            SHUFFLE [RS_32]
-                              PartitionCols:_col2
-                              Select Operator [SEL_27] (rows=766650239 width=88)
-                                Output:["_col10","_col11","_col12","_col15","_col2","_col4","_col9"]
-                                Merge Join Operator [MERGEJOIN_72] (rows=766650239 width=88)
-                                  Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col2","_col4","_col9","_col10","_col11","_col12","_col15"]
-                                <-Map 13 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_25]
+              Select Operator [SEL_40] (rows=421657640 width=88)
+                Output:["_col0","_col1","_col2","_col3","_col4"]
+                Group By Operator [GBY_39] (rows=421657640 width=88)
+                  Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
+                <-Reducer 3 [SIMPLE_EDGE]
+                  SHUFFLE [RS_38]
+                    PartitionCols:_col0, _col1, _col2, _col3
+                    Group By Operator [GBY_37] (rows=843315281 width=88)
+                      Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col7)"],keys:_col10, _col9, _col11, _col12
+                      Select Operator [SEL_36] (rows=843315281 width=88)
+                        Output:["_col10","_col9","_col11","_col12","_col7"]
+                        Filter Operator [FIL_35] (rows=843315281 width=88)
+                          predicate:(substr(_col17, 1, 5) <> substr(_col19, 1, 5))
+                          Select Operator [SEL_34] (rows=843315281 width=88)
+                            Output:["_col7","_col9","_col10","_col11","_col12","_col17","_col19"]
+                            Merge Join Operator [MERGEJOIN_73] (rows=843315281 width=88)
+                              Conds:RS_31._col0=RS_32._col2(Inner),Output:["_col3","_col8","_col13","_col14","_col15","_col16","_col19"]
+                            <-Reducer 10 [SIMPLE_EDGE]
+                              SHUFFLE [RS_32]
+                                PartitionCols:_col2
+                                Select Operator [SEL_27] (rows=766650239 width=88)
+                                  Output:["_col10","_col11","_col12","_col15","_col2","_col4","_col9"]
+                                  Merge Join Operator [MERGEJOIN_72] (rows=766650239 width=88)
+                                    Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col2","_col4","_col9","_col10","_col11","_col12","_col15"]
+                                  <-Map 13 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_25]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_17] (rows=1704 width=1910)
+                                        Output:["_col0","_col1"]
+                                        Filter Operator [FIL_68] (rows=1704 width=1910)
+                                          predicate:s_store_sk is not null
+                                          TableScan [TS_15] (rows=1704 width=1910)
+                                            default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_zip"]
+                                  <-Reducer 9 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_24]
+                                      PartitionCols:_col3
+                                      Merge Join Operator [MERGEJOIN_71] (rows=696954748 width=88)
+                                        Conds:RS_21._col1=RS_22._col0(Inner),Output:["_col2","_col3","_col4","_col9","_col10","_col11","_col12"]
+                                      <-Map 12 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_22]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_14] (rows=231000 width=1436)
+                                            Output:["_col0","_col1","_col2","_col3","_col4"]
+                                            Filter Operator [FIL_67] (rows=231000 width=1436)
+                                              predicate:((i_manager_id = 7) and i_item_sk is not null)
+                                              TableScan [TS_12] (rows=462000 width=1436)
+                                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id","i_manufact","i_manager_id"]
+                                      <-Reducer 8 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_21]
+                                          PartitionCols:_col1
+                                          Merge Join Operator [MERGEJOIN_70] (rows=633595212 width=88)
+                                            Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
+                                          <-Map 11 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_19]
+                                              PartitionCols:_col0
+                                              Select Operator [SEL_11] (rows=18262 width=1119)
+                                                Output:["_col0"]
+                                                Filter Operator [FIL_66] (rows=18262 width=1119)
+                                                  predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null)
+                                                  TableScan [TS_9] (rows=73049 width=1119)
+                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                          <-Map 7 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_18]
+                                              PartitionCols:_col0
+                                              Select Operator [SEL_8] (rows=575995635 width=88)
+                                                Output:["_col0","_col1","_col2","_col3","_col4"]
+                                                Filter Operator [FIL_65] (rows=575995635 width=88)
+                                                  predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null)
+                                                  TableScan [TS_6] (rows=575995635 width=88)
+                                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"]
+                            <-Reducer 2 [SIMPLE_EDGE]
+                              SHUFFLE [RS_31]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_69] (rows=88000001 width=860)
+                                  Conds:RS_28._col1=RS_29._col0(Inner),Output:["_col0","_col3"]
+                                <-Map 1 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_28]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_2] (rows=80000000 width=860)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_63] (rows=80000000 width=860)
+                                        predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
+                                        TableScan [TS_0] (rows=80000000 width=860)
+                                          default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
+                                <-Map 6 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_29]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_17] (rows=1704 width=1910)
+                                    Select Operator [SEL_5] (rows=40000000 width=1014)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_68] (rows=1704 width=1910)
-                                        predicate:s_store_sk is not null
-                                        TableScan [TS_15] (rows=1704 width=1910)
-                                          default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_zip"]
-                                <-Reducer 9 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_24]
-                                    PartitionCols:_col3
-                                    Merge Join Operator [MERGEJOIN_71] (rows=696954748 width=88)
-                                      Conds:RS_21._col1=RS_22._col0(Inner),Output:["_col2","_col3","_col4","_col9","_col10","_col11","_col12"]
-                                    <-Map 12 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_22]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_14] (rows=231000 width=1436)
-                                          Output:["_col0","_col1","_col2","_col3","_col4"]
-                                          Filter Operator [FIL_67] (rows=231000 width=1436)
-                                            predicate:((i_manager_id = 7) and i_item_sk is not null)
-                                            TableScan [TS_12] (rows=462000 width=1436)
-                                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id","i_manufact","i_manager_id"]
-                                    <-Reducer 8 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_21]
-                                        PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_70] (rows=633595212 width=88)
-                                          Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
-                                        <-Map 11 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_19]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_11] (rows=18262 width=1119)
-                                              Output:["_col0"]
-                                              Filter Operator [FIL_66] (rows=18262 width=1119)
-                                                predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null)
-                                                TableScan [TS_9] (rows=73049 width=1119)
-                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                        <-Map 7 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_18]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_8] (rows=575995635 width=88)
-                                              Output:["_col0","_col1","_col2","_col3","_col4"]
-                                              Filter Operator [FIL_65] (rows=575995635 width=88)
-                                                predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null)
-                                                TableScan [TS_6] (rows=575995635 width=88)
-                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"]
-                          <-Reducer 2 [SIMPLE_EDGE]
-                            SHUFFLE [RS_31]
-                              PartitionCols:_col0
-                              Merge Join Operator [MERGEJOIN_69] (rows=88000001 width=860)
-                                Conds:RS_28._col1=RS_29._col0(Inner),Output:["_col0","_col3"]
-                              <-Map 1 [SIMPLE_EDGE]
-                                SHUFFLE [RS_28]
-                                  PartitionCols:_col1
-                                  Select Operator [SEL_2] (rows=80000000 width=860)
-                                    Output:["_col0","_col1"]
-                                    Filter Operator [FIL_63] (rows=80000000 width=860)
-                                      predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
-                                      TableScan [TS_0] (rows=80000000 width=860)
-                                        default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
-                              <-Map 6 [SIMPLE_EDGE]
-                                SHUFFLE [RS_29]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_5] (rows=40000000 width=1014)
-                                    Output:["_col0","_col1"]
-                                    Filter Operator [FIL_64] (rows=40000000 width=1014)
-                                      predicate:ca_address_sk is not null
-                                      TableScan [TS_3] (rows=40000000 width=1014)
-                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_zip"]
+                                      Filter Operator [FIL_64] (rows=40000000 width=1014)
+                                        predicate:ca_address_sk is not null
+                                        TableScan [TS_3] (rows=40000000 width=1014)
+                                          default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_zip"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query20.q.out b/ql/src/test/results/clientpositive/perf/query20.q.out
index 3eed0a8..bf23bf8 100644
--- a/ql/src/test/results/clientpositive/perf/query20.q.out
+++ b/ql/src/test/results/clientpositive/perf/query20.q.out
@@ -40,9 +40,9 @@ Stage-0
                           SHUFFLE [RS_17]
                             PartitionCols:_col0, _col1, _col2, _col3, _col4
                             Group By Operator [GBY_16] (rows=348467716 width=135)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col6, _col7, _col8, _col9, _col10
+                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col10, _col9, _col6, _col7, _col8
                               Select Operator [SEL_15] (rows=348467716 width=135)
-                                Output:["_col6","_col7","_col8","_col9","_col10","_col2"]
+                                Output:["_col10","_col9","_col6","_col7","_col8","_col2"]
                                 Merge Join Operator [MERGEJOIN_38] (rows=348467716 width=135)
                                   Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col6","_col7","_col8","_col9","_col10"]
                                 <-Map 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query25.q.out b/ql/src/test/results/clientpositive/perf/query25.q.out
index 94b575f..918ca0b 100644
--- a/ql/src/test/results/clientpositive/perf/query25.q.out
+++ b/ql/src/test/results/clientpositive/perf/query25.q.out
@@ -100,10 +100,10 @@ Stage-0
                                           SHUFFLE [RS_24]
                                             PartitionCols:_col0
                                             Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
-                                              Conds:RS_21._col2, _col1, _col4=RS_22._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                              Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
                                             <-Map 13 [SIMPLE_EDGE]
                                               SHUFFLE [RS_22]
-                                                PartitionCols:_col2, _col1, _col3
+                                                PartitionCols:_col1, _col2, _col3
                                                 Select Operator [SEL_11] (rows=57591150 width=77)
                                                   Output:["_col0","_col1","_col2","_col3","_col4"]
                                                   Filter Operator [FIL_89] (rows=57591150 width=77)
@@ -112,7 +112,7 @@ Stage-0
                                                       default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_net_loss"]
                                             <-Map 8 [SIMPLE_EDGE]
                                               SHUFFLE [RS_21]
-                                                PartitionCols:_col2, _col1, _col4
+                                                PartitionCols:_col1, _col2, _col4
                                                 Select Operator [SEL_8] (rows=575995635 width=88)
                                                   Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                   Filter Operator [FIL_88] (rows=575995635 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query29.q.out b/ql/src/test/results/clientpositive/perf/query29.q.out
index c53d65d..d657777 100644
--- a/ql/src/test/results/clientpositive/perf/query29.q.out
+++ b/ql/src/test/results/clientpositive/perf/query29.q.out
@@ -100,10 +100,10 @@ Stage-0
                                           SHUFFLE [RS_24]
                                             PartitionCols:_col0
                                             Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
-                                              Conds:RS_21._col2, _col1, _col4=RS_22._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                              Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
                                             <-Map 13 [SIMPLE_EDGE]
                                               SHUFFLE [RS_22]
-                                                PartitionCols:_col2, _col1, _col3
+                                                PartitionCols:_col1, _col2, _col3
                                                 Select Operator [SEL_11] (rows=57591150 width=77)
                                                   Output:["_col0","_col1","_col2","_col3","_col4"]
                                                   Filter Operator [FIL_89] (rows=57591150 width=77)
@@ -112,7 +112,7 @@ Stage-0
                                                       default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
                                             <-Map 8 [SIMPLE_EDGE]
                                               SHUFFLE [RS_21]
-                                                PartitionCols:_col2, _col1, _col4
+                                                PartitionCols:_col1, _col2, _col4
                                                 Select Operator [SEL_8] (rows=575995635 width=88)
                                                   Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                                   Filter Operator [FIL_88] (rows=575995635 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query3.q.out b/ql/src/test/results/clientpositive/perf/query3.q.out
index 4260b11..2845a88 100644
--- a/ql/src/test/results/clientpositive/perf/query3.q.out
+++ b/ql/src/test/results/clientpositive/perf/query3.q.out
@@ -22,49 +22,47 @@ Stage-0
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 4 [SIMPLE_EDGE]
             SHUFFLE [RS_21]
-              Select Operator [SEL_19] (rows=348477374 width=88)
-                Output:["_col0","_col1","_col2","_col3"]
-                Group By Operator [GBY_18] (rows=348477374 width=88)
-                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2
-                <-Reducer 3 [SIMPLE_EDGE]
-                  SHUFFLE [RS_17]
-                    PartitionCols:_col0, _col1, _col2
-                    Group By Operator [GBY_16] (rows=696954748 width=88)
-                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col4, _col5, _col8
-                      Select Operator [SEL_15] (rows=696954748 width=88)
-                        Output:["_col4","_col5","_col8","_col2"]
-                        Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
-                          Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col2","_col4","_col5","_col8"]
-                        <-Map 7 [SIMPLE_EDGE]
-                          SHUFFLE [RS_13]
-                            PartitionCols:_col0
-                            Select Operator [SEL_8] (rows=36524 width=1119)
-                              Output:["_col0","_col1"]
-                              Filter Operator [FIL_32] (rows=36524 width=1119)
-                                predicate:((d_moy = 12) and d_date_sk is not null)
-                                TableScan [TS_6] (rows=73049 width=1119)
-                                  default@date_dim,dt,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                        <-Reducer 2 [SIMPLE_EDGE]
-                          SHUFFLE [RS_12]
-                            PartitionCols:_col0
-                            Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
-                              Conds:RS_9._col1=RS_10._col0(Inner),Output:["_col0","_col2","_col4","_col5"]
-                            <-Map 1 [SIMPLE_EDGE]
-                              SHUFFLE [RS_9]
-                                PartitionCols:_col1
-                                Select Operator [SEL_2] (rows=575995635 width=88)
-                                  Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_30] (rows=575995635 width=88)
-                                    predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
-                                    TableScan [TS_0] (rows=575995635 width=88)
-                                      default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
-                            <-Map 6 [SIMPLE_EDGE]
-                              SHUFFLE [RS_10]
-                                PartitionCols:_col0
-                                Select Operator [SEL_5] (rows=231000 width=1436)
-                                  Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_31] (rows=231000 width=1436)
-                                    predicate:((i_manufact_id = 436) and i_item_sk is not null)
-                                    TableScan [TS_3] (rows=462000 width=1436)
-                                      default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id"]
+              Group By Operator [GBY_18] (rows=348477374 width=88)
+                Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2
+              <-Reducer 3 [SIMPLE_EDGE]
+                SHUFFLE [RS_17]
+                  PartitionCols:_col0, _col1, _col2
+                  Group By Operator [GBY_16] (rows=696954748 width=88)
+                    Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col8, _col4, _col5
+                    Select Operator [SEL_15] (rows=696954748 width=88)
+                      Output:["_col8","_col4","_col5","_col2"]
+                      Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
+                        Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col2","_col4","_col5","_col8"]
+                      <-Map 7 [SIMPLE_EDGE]
+                        SHUFFLE [RS_13]
+                          PartitionCols:_col0
+                          Select Operator [SEL_8] (rows=36524 width=1119)
+                            Output:["_col0","_col1"]
+                            Filter Operator [FIL_32] (rows=36524 width=1119)
+                              predicate:((d_moy = 12) and d_date_sk is not null)
+                              TableScan [TS_6] (rows=73049 width=1119)
+                                default@date_dim,dt,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                      <-Reducer 2 [SIMPLE_EDGE]
+                        SHUFFLE [RS_12]
+                          PartitionCols:_col0
+                          Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
+                            Conds:RS_9._col1=RS_10._col0(Inner),Output:["_col0","_col2","_col4","_col5"]
+                          <-Map 1 [SIMPLE_EDGE]
+                            SHUFFLE [RS_9]
+                              PartitionCols:_col1
+                              Select Operator [SEL_2] (rows=575995635 width=88)
+                                Output:["_col0","_col1","_col2"]
+                                Filter Operator [FIL_30] (rows=575995635 width=88)
+                                  predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
+                                  TableScan [TS_0] (rows=575995635 width=88)
+                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
+                          <-Map 6 [SIMPLE_EDGE]
+                            SHUFFLE [RS_10]
+                              PartitionCols:_col0
+                              Select Operator [SEL_5] (rows=231000 width=1436)
+                                Output:["_col0","_col1","_col2"]
+                                Filter Operator [FIL_31] (rows=231000 width=1436)
+                                  predicate:((i_manufact_id = 436) and i_item_sk is not null)
+                                  TableScan [TS_3] (rows=462000 width=1436)
+                                    default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query39.q.out b/ql/src/test/results/clientpositive/perf/query39.q.out
index 5c90a53..bde20a6 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -29,10 +29,10 @@ Stage-0
             Select Operator [SEL_59] (rows=13756683 width=15)
               Output:["_col0","_col1","_col3","_col4","_col5","_col6","_col8","_col9"]
               Merge Join Operator [MERGEJOIN_103] (rows=13756683 width=15)
-                Conds:RS_56._col2, _col1=RS_57._col2, _col1(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col9"]
+                Conds:RS_56._col1, _col2=RS_57._col1, _col2(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col9"]
               <-Reducer 15 [SIMPLE_EDGE]
                 SHUFFLE [RS_57]
-                  PartitionCols:_col2, _col1
+                  PartitionCols:_col1, _col2
                   Select Operator [SEL_55] (rows=12506076 width=15)
                     Output:["_col1","_col2","_col3","_col4"]
                     Filter Operator [FIL_54] (rows=12506076 width=15)
@@ -45,9 +45,9 @@ Stage-0
                           SHUFFLE [RS_51]
                             PartitionCols:_col0, _col1, _col2
                             Group By Operator [GBY_50] (rows=50024305 width=15)
-                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col7, _col8, _col9
+                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col8, _col7, _col9
                               Select Operator [SEL_49] (rows=50024305 width=15)
-                                Output:["_col7","_col8","_col9","_col3"]
+                                Output:["_col8","_col7","_col9","_col3"]
                                 Merge Join Operator [MERGEJOIN_102] (rows=50024305 width=15)
                                   Conds:RS_46._col2=RS_47._col0(Inner),Output:["_col3","_col7","_col8","_col9"]
                                 <-Map 18 [SIMPLE_EDGE]
@@ -98,7 +98,7 @@ Stage-0
                                                   default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
               <-Reducer 5 [SIMPLE_EDGE]
                 SHUFFLE [RS_56]
-                  PartitionCols:_col2, _col1
+                  PartitionCols:_col1, _col2
                   Select Operator [SEL_27] (rows=12506076 width=15)
                     Output:["_col1","_col2","_col3","_col4"]
                     Filter Operator [FIL_26] (rows=12506076 width=15)
@@ -111,9 +111,9 @@ Stage-0
                           SHUFFLE [RS_23]
                             PartitionCols:_col0, _col1, _col2
                             Group By Operator [GBY_22] (rows=50024305 width=15)
-                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col7, _col8, _col9
+                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col8, _col7, _col9
                               Select Operator [SEL_21] (rows=50024305 width=15)
-                                Output:["_col7","_col8","_col9","_col3"]
+                                Output:["_col8","_col7","_col9","_col3"]
                                 Merge Join Operator [MERGEJOIN_99] (rows=50024305 width=15)
                                   Conds:RS_18._col2=RS_19._col0(Inner),Output:["_col3","_col7","_col8","_col9"]
                                 <-Map 10 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query40.q.out b/ql/src/test/results/clientpositive/perf/query40.q.out
index c3c746b..eff6134 100644
--- a/ql/src/test/results/clientpositive/perf/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/query40.q.out
@@ -76,10 +76,10 @@ Stage-0
                                 SHUFFLE [RS_18]
                                   PartitionCols:_col0
                                   Merge Join Operator [MERGEJOIN_55] (rows=316788826 width=135)
-                                    Conds:RS_15._col3, _col2=RS_16._col1, _col0(Left Outer),Output:["_col0","_col1","_col2","_col4","_col7"]
+                                    Conds:RS_15._col2, _col3=RS_16._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col4","_col7"]
                                   <-Map 1 [SIMPLE_EDGE]
                                     SHUFFLE [RS_15]
-                                      PartitionCols:_col3, _col2
+                                      PartitionCols:_col2, _col3
                                       Select Operator [SEL_2] (rows=287989836 width=135)
                                         Output:["_col0","_col1","_col2","_col3","_col4"]
                                         Filter Operator [FIL_50] (rows=287989836 width=135)
@@ -88,7 +88,7 @@ Stage-0
                                             default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_order_number","cs_sales_price"]
                                   <-Map 8 [SIMPLE_EDGE]
                                     SHUFFLE [RS_16]
-                                      PartitionCols:_col1, _col0
+                                      PartitionCols:_col0, _col1
                                       Select Operator [SEL_5] (rows=28798881 width=106)
                                         Output:["_col0","_col1","_col2"]
                                         Filter Operator [FIL_51] (rows=28798881 width=106)

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query45.q.out b/ql/src/test/results/clientpositive/perf/query45.q.out
index 04f9b02..c11cd2d 100644
--- a/ql/src/test/results/clientpositive/perf/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/query45.q.out
@@ -25,15 +25,15 @@ Stage-0
             Output:["_col0","_col1","_col2"]
           <-Reducer 4 [SIMPLE_EDGE]
             SHUFFLE [RS_42]
-              Select Operator [SEL_41] (rows=95833781 width=135)
-                Output:["_col0","_col1","_col2"]
-                Group By Operator [GBY_40] (rows=95833781 width=135)
-                  Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
-                <-Reducer 3 [SIMPLE_EDGE]
-                  SHUFFLE [RS_39]
-                    PartitionCols:_col0, _col1
-                    Group By Operator [GBY_38] (rows=191667562 width=135)
-                      Output:["_col0","_col1","_col2"],aggregations:["sum(_col10)"],keys:_col3, _col4
+              Group By Operator [GBY_40] (rows=95833781 width=135)
+                Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
+              <-Reducer 3 [SIMPLE_EDGE]
+                SHUFFLE [RS_39]
+                  PartitionCols:_col0, _col1
+                  Group By Operator [GBY_38] (rows=191667562 width=135)
+                    Output:["_col0","_col1","_col2"],aggregations:["sum(_col10)"],keys:_col4, _col3
+                    Select Operator [SEL_37] (rows=191667562 width=135)
+                      Output:["_col4","_col3","_col10"]
                       Merge Join Operator [MERGEJOIN_72] (rows=191667562 width=135)
                         Conds:RS_34._col0=RS_35._col4(Inner),Output:["_col3","_col4","_col10"]
                       <-Reducer 2 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query46.q.out b/ql/src/test/results/clientpositive/perf/query46.q.out
index 22bf29b..c387332 100644
--- a/ql/src/test/results/clientpositive/perf/query46.q.out
+++ b/ql/src/test/results/clientpositive/perf/query46.q.out
@@ -43,9 +43,9 @@ Stage-0
                           SHUFFLE [RS_35]
                             PartitionCols:_col0, _col1, _col2, _col3
                             Group By Operator [GBY_34] (rows=843315281 width=88)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col6)","sum(_col7)"],keys:_col17, _col1, _col3, _col5
+                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col6)","sum(_col7)"],keys:_col1, _col17, _col3, _col5
                               Select Operator [SEL_33] (rows=843315281 width=88)
-                                Output:["_col17","_col1","_col3","_col5","_col6","_col7"]
+                                Output:["_col1","_col17","_col3","_col5","_col6","_col7"]
                                 Merge Join Operator [MERGEJOIN_85] (rows=843315281 width=88)
                                   Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col17"]
                                 <-Map 15 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/4accba2f/ql/src/test/results/clientpositive/perf/query50.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query50.q.out b/ql/src/test/results/clientpositive/perf/query50.q.out
index 781d3ec..8583f7f 100644
--- a/ql/src/test/results/clientpositive/perf/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/query50.q.out
@@ -188,10 +188,10 @@ Stage-0
                                 SHUFFLE [RS_18]
                                   PartitionCols:_col5
                                   Merge Join Operator [MERGEJOIN_56] (rows=633595212 width=88)
-                                    Conds:RS_15._col4, _col1, _col2=RS_16._col3, _col1, _col2(Inner),Output:["_col0","_col3","_col5"]
+                                    Conds:RS_15._col1, _col2, _col4=RS_16._col1, _col2, _col3(Inner),Output:["_col0","_col3","_col5"]
                                   <-Map 1 [SIMPLE_EDGE]
                                     SHUFFLE [RS_15]
-                                      PartitionCols:_col4, _col1, _col2
+                                      PartitionCols:_col1, _col2, _col4
                                       Select Operator [SEL_2] (rows=575995635 width=88)
                                         Output:["_col0","_col1","_col2","_col3","_col4"]
                                         Filter Operator [FIL_51] (rows=575995635 width=88)
@@ -200,7 +200,7 @@ Stage-0
                                             default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number"]
                                   <-Map 8 [SIMPLE_EDGE]
                                     SHUFFLE [RS_16]
-                                      PartitionCols:_col3, _col1, _col2
+                                      PartitionCols:_col1, _col2, _col3
                                       Select Operator [SEL_5] (rows=57591150 width=77)
                                         Output:["_col0","_col1","_col2","_col3"]
                                         Filter Operator [FIL_52] (rows=57591150 width=77)


Mime
View raw message