hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcama...@apache.org
Subject [05/17] hive git commit: HIVE-16934: Transform COUNT(x) into COUNT() when x is not nullable (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)
Date Sat, 24 Jun 2017 09:49:23 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
index e2c1a91..8292e3a 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
@@ -60,11 +60,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -158,7 +158,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -253,11 +253,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -324,7 +324,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -456,11 +456,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -554,7 +554,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -639,11 +639,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -737,7 +737,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -830,11 +830,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col1
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -928,7 +928,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -1024,11 +1024,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -1095,7 +1095,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1233,7 +1233,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: _col0 (type: string), _col1 (type: double)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
@@ -1438,11 +1438,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1519,7 +1519,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1661,11 +1661,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1759,7 +1759,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:t1]
+              /t1 [null-subquery1:$hdt$_0-subquery1:t1]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -1768,11 +1768,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1866,7 +1866,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1]
+              /t1 [null-subquery2:$hdt$_0-subquery2:t1]
 
   Stage: Stage-0
     Move Operator
@@ -1974,11 +1974,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -2072,7 +2072,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:t1]
+              /t1 [null-subquery1:$hdt$_0-subquery1:t1]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -2084,7 +2084,7 @@ STAGE PLANS:
                     outputColumnNames: _col0
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: _col0 (type: double)
                       mode: hash
                       outputColumnNames: _col0, _col1
@@ -2311,25 +2311,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 0
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2384,7 +2380,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -2395,25 +2391,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 1
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 1
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2468,7 +2460,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_1:$hdt$_1:t1]
+              /t1 [$hdt$_1:t1]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -2618,25 +2610,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 0
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2691,7 +2679,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -2702,25 +2690,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string), val (type: string)
-                      outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string), _col1 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1, _col2
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string), _col1 (type: string)
+                        null sort order: aa
+                        sort order: ++
+                        Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
                         Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string), _col1 (type: string)
-                          null sort order: aa
-                          sort order: ++
-                          Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
-                          Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                          tag: -1
-                          value expressions: _col2 (type: bigint)
-                          auto parallelism: false
+                        tag: -1
+                        value expressions: _col2 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2775,7 +2759,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_1:$hdt$_1:t1]
+              /t1 [$hdt$_1:t1]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -2882,12 +2866,12 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       bucketGroup: true
-                      keys: _col0 (type: string)
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -2954,7 +2938,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -3084,11 +3068,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3182,7 +3166,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3278,11 +3262,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3376,7 +3360,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3471,11 +3455,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3569,7 +3553,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3671,11 +3655,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3769,7 +3753,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
index 6745d7e..4284726 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
@@ -60,11 +60,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -158,7 +158,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -254,11 +254,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -325,7 +325,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -475,11 +475,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -573,7 +573,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -658,11 +658,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -756,7 +756,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -849,11 +849,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col1
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -947,7 +947,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
 
   Stage: Stage-0
     Move Operator
@@ -1044,11 +1044,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -1115,7 +1115,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:t1]
+              /t1 [t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1272,7 +1272,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: _col0 (type: string), _col1 (type: double)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
@@ -1496,11 +1496,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1577,7 +1577,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -1737,11 +1737,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1835,7 +1835,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:t1]
+              /t1 [null-subquery1:$hdt$_0-subquery1:t1]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -1844,11 +1844,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -1942,7 +1942,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1]
+              /t1 [null-subquery2:$hdt$_0-subquery2:t1]
 
   Stage: Stage-0
     Move Operator
@@ -2051,11 +2051,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -2149,7 +2149,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:t1]
+              /t1 [null-subquery1:$hdt$_0-subquery1:t1]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -2161,7 +2161,7 @@ STAGE PLANS:
                     outputColumnNames: _col0
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: _col0 (type: double)
                       mode: hash
                       outputColumnNames: _col0, _col1
@@ -2406,25 +2406,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 0
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2479,7 +2475,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -2490,25 +2486,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 1
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 1
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2563,7 +2555,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_1:$hdt$_1:t1]
+              /t1 [$hdt$_1:t1]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -2714,25 +2706,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: final
-                        outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: final
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
-                          tag: 0
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: 0
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2787,7 +2775,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_0:$hdt$_0:t1]
+              /t1 [$hdt$_0:t1]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -2798,25 +2786,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string), val (type: string)
-                      outputColumnNames: _col0, _col1
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string), _col1 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1, _col2
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string), _col1 (type: string)
+                        null sort order: aa
+                        sort order: ++
+                        Map-reduce partition columns: rand() (type: double)
                         Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string), _col1 (type: string)
-                          null sort order: aa
-                          sort order: ++
-                          Map-reduce partition columns: rand() (type: double)
-                          Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
-                          tag: -1
-                          value expressions: _col2 (type: bigint)
-                          auto parallelism: false
+                        tag: -1
+                        value expressions: _col2 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -2871,7 +2855,7 @@ STAGE PLANS:
                     name: default.t1
                   name: default.t1
             Truncated Path -> Alias:
-              /t1 [$hdt$_1:$hdt$_1:t1]
+              /t1 [$hdt$_1:t1]
         Reducer 2 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -2997,12 +2981,12 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       bucketGroup: true
-                      keys: _col0 (type: string)
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -3069,7 +3053,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
         Reducer 2 
             Needs Tagging: false
             Reduce Operator Tree:
@@ -3217,11 +3201,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3315,7 +3299,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3411,11 +3395,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col2
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col2 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3509,7 +3493,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3604,11 +3588,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3702,7 +3686,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator
@@ -3804,11 +3788,11 @@ STAGE PLANS:
                   GatherStats: false
                   Select Operator
                     expressions: key (type: string), val (type: string)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, val
                     Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string), _col1 (type: string)
+                      aggregations: count()
+                      keys: key (type: string), val (type: string)
                       mode: final
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE Column stats: NONE
@@ -3902,7 +3886,7 @@ STAGE PLANS:
                     name: default.t2
                   name: default.t2
             Truncated Path -> Alias:
-              /t2 [$hdt$_0:t2]
+              /t2 [t2]
 
   Stage: Stage-0
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join29.q.out b/ql/src/test/results/clientpositive/spark/join29.q.out
index 573628f..88929fe 100644
--- a/ql/src/test/results/clientpositive/spark/join29.q.out
+++ b/ql/src/test/results/clientpositive/spark/join29.q.out
@@ -39,22 +39,18 @@ STAGE PLANS:
                   Filter Operator
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 25 Data size: 191 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: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
-                          value expressions: _col1 (type: bigint)
+                        value expressions: _col1 (type: bigint)
         Reducer 2 
             Local Work:
               Map Reduce Local Work
@@ -84,22 +80,18 @@ STAGE PLANS:
                   Filter Operator
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1
+                      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
-                        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: bigint)
+                        value expressions: _col1 (type: bigint)
         Reducer 4 
             Local Work:
               Map Reduce Local Work

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/join30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join30.q.out b/ql/src/test/results/clientpositive/spark/join30.q.out
index 3584f8c..23650ff 100644
--- a/ql/src/test/results/clientpositive/spark/join30.q.out
+++ b/ql/src/test/results/clientpositive/spark/join30.q.out
@@ -73,7 +73,7 @@ STAGE PLANS:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                         Group By Operator
-                          aggregations: count(1)
+                          aggregations: count()
                           keys: _col0 (type: string)
                           mode: hash
                           outputColumnNames: _col0, _col1
@@ -132,7 +132,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 POSTHOOK: Output: default@dest_j1
-POSTHOOK: Lineage: dest_j1.cnt EXPRESSION [(src1)x.null, ]
+POSTHOOK: Lineage: dest_j1.cnt EXPRESSION [(src1)x.null, (src)y.null, ]
 POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src1)x.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: select * from dest_j1
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/join31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join31.q.out b/ql/src/test/results/clientpositive/spark/join31.q.out
index 3fee7b8..4edb4ef 100644
--- a/ql/src/test/results/clientpositive/spark/join31.q.out
+++ b/ql/src/test/results/clientpositive/spark/join31.q.out
@@ -100,7 +100,7 @@ STAGE PLANS:
                     1 Map 4
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
                   Group By Operator
-                    aggregations: count(1)
+                    aggregations: count()
                     keys: _col0 (type: string)
                     mode: hash
                     outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out b/ql/src/test/results/clientpositive/spark/join35.q.out
index 74e8ee9..54f68af 100644
--- a/ql/src/test/results/clientpositive/spark/join35.q.out
+++ b/ql/src/test/results/clientpositive/spark/join35.q.out
@@ -50,25 +50,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: (UDFToDouble(key) < 20.0) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                          tag: -1
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: -1
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -119,7 +115,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:x]
+              /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x]
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -130,25 +126,21 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: (UDFToDouble(key) > 100.0) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                    Group By Operator
+                      aggregations: count()
+                      keys: key (type: string)
+                      mode: hash
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                      Group By Operator
-                        aggregations: count(1)
-                        keys: _col0 (type: string)
-                        mode: hash
-                        outputColumnNames: _col0, _col1
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                        Reduce Output Operator
-                          key expressions: _col0 (type: string)
-                          null sort order: a
-                          sort order: +
-                          Map-reduce partition columns: _col0 (type: string)
-                          Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
-                          tag: -1
-                          value expressions: _col1 (type: bigint)
-                          auto parallelism: false
+                        tag: -1
+                        value expressions: _col1 (type: bigint)
+                        auto parallelism: false
             Path -> Alias:
 #### A masked pattern was here ####
             Path -> Partition:
@@ -199,7 +191,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:x1]
+              /src [$hdt$_0-subquery2:$hdt$_0-subquery2:x1]
         Map 6 
             Map Operator Tree:
                 TableScan

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/join38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join38.q.out b/ql/src/test/results/clientpositive/spark/join38.q.out
index 7e4b790..f4f31c0 100644
--- a/ql/src/test/results/clientpositive/spark/join38.q.out
+++ b/ql/src/test/results/clientpositive/spark/join38.q.out
@@ -105,22 +105,18 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                        Select Operator
-                          expressions: _col1 (type: string), _col2 (type: string)
-                          outputColumnNames: _col0, _col1
+                        Group By Operator
+                          aggregations: count()
+                          keys: _col1 (type: string), _col2 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                          Group By Operator
-                            aggregations: count(1)
-                            keys: _col0 (type: string), _col1 (type: string)
-                            mode: hash
-                            outputColumnNames: _col0, _col1, _col2
+                          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: 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), _col1 (type: string)
-                              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                              value expressions: _col2 (type: bigint)
+                            value expressions: _col2 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Reducer 2 

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out b/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
index 19c1e5f..ac74eaf 100644
--- a/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
@@ -879,11 +879,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -901,11 +901,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/merge1.q.out b/ql/src/test/results/clientpositive/spark/merge1.q.out
index d5b1e9f..8e671e9 100644
--- a/ql/src/test/results/clientpositive/spark/merge1.q.out
+++ b/ql/src/test/results/clientpositive/spark/merge1.q.out
@@ -38,11 +38,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/spark/merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/merge2.q.out b/ql/src/test/results/clientpositive/spark/merge2.q.out
index d780dc2..24116cb 100644
--- a/ql/src/test/results/clientpositive/spark/merge2.q.out
+++ b/ql/src/test/results/clientpositive/spark/merge2.q.out
@@ -38,11 +38,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE


Mime
View raw message