You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/11/29 04:44:28 UTC

svn commit: r1642395 [16/22] - in /hive/branches/spark/ql/src: java/org/apache/hadoop/hive/ql/exec/spark/ java/org/apache/hadoop/hive/ql/exec/spark/session/ test/results/clientpositive/ test/results/clientpositive/spark/

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out Sat Nov 29 03:44:22 2014
@@ -83,19 +83,19 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 1 
+        Map 3 
             Map Operator Tree:
                 TableScan
-                  alias: c
-                  Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
+                  alias: b
+                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {key} {val}
-                        1 {key} {val}
-                        2 {val}
+                        1 {val}
+                        2 {key} {val}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -105,16 +105,16 @@ STAGE PLANS:
         Map 4 
             Map Operator Tree:
                 TableScan
-                  alias: b
-                  Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
+                  alias: c
+                  Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {key} {val}
-                        1 {val}
-                        2 {key} {val}
+                        1 {key} {val}
+                        2 {val}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -125,15 +125,15 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Union 3 <- Map 2 (NONE, 0), Map 7 (NONE, 0)
+        Union 2 <- Map 1 (NONE, 0), Map 7 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:
-        Map 2 
+        Map 1 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -148,19 +148,17 @@ STAGE PLANS:
                         2 key (type: string)
                       outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                       input vertices:
-                        1 Map 4
-                        2 Map 1
+                        1 Map 3
+                        2 Map 4
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 7 
@@ -168,7 +166,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -188,18 +186,16 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
-        Union 3 
-            Vertex: Union 3
+        Union 2 
+            Vertex: Union 2
 
   Stage: Stage-3
     Spark
@@ -211,7 +207,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -230,7 +226,7 @@ STAGE PLANS:
                   alias: c
                   Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (((key = '2') or (key = '8')) or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not (((key = '2') or (key = '8')) or (key = '3')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out Sat Nov 29 03:44:22 2014
@@ -63,7 +63,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -86,7 +86,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -102,14 +102,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -117,7 +115,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -133,14 +131,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 2 
@@ -156,7 +152,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -219,7 +215,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: ((key = '2') or (key = '3')) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -242,7 +238,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: ((key = '2') or (key = '3')) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -258,14 +254,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 4 
@@ -273,7 +267,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: ((key = '2') or (key = '3')) (type: boolean)
+                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -289,14 +283,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 3 
@@ -312,7 +304,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key = '2') or (key = '3')) (type: boolean)
+                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -377,7 +369,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -401,7 +393,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
+                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -413,16 +405,13 @@ STAGE PLANS:
                         1 key (type: string)
                       input vertices:
                         1 Map 4
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Map 6 
@@ -430,7 +419,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -442,16 +431,13 @@ STAGE PLANS:
                         1 key (type: string)
                       input vertices:
                         1 Map 5
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Reducer 3 
@@ -485,7 +471,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: (key is not null and (not ((key = '2') or (key = '3')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -537,7 +523,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: ((key = '2') or (key = '3')) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -561,7 +547,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
+                    predicate: ((key = '2') or (key = '3')) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -573,16 +559,13 @@ STAGE PLANS:
                         1 key (type: string)
                       input vertices:
                         0 Map 1
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -590,7 +573,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: ((key = '2') or (key = '3')) (type: boolean)
+                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -602,16 +585,13 @@ STAGE PLANS:
                         1 key (type: string)
                       input vertices:
                         0 Map 6
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Reducer 4 
@@ -645,7 +625,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key = '2') or (key = '3')) (type: boolean)
+                    predicate: (not ((key = '2') or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out Sat Nov 29 03:44:22 2014
@@ -65,7 +65,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not (key = '8'))) (type: boolean)
+                    predicate: (key is not null and (key = '8')) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -80,15 +80,15 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Union 4 <- Map 3 (NONE, 0), Map 5 (NONE, 0)
+        Union 3 <- Map 2 (NONE, 0), Map 4 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:
-        Map 3 
+        Map 2 
             Map Operator Tree:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (key is not null and (not (key = '8'))) (type: boolean)
+                    predicate: (key is not null and (key = '8')) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -104,13 +104,27 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col6 (type: array<string>)
                         outputColumnNames: _col0, _col1
-                        Select Operator
-                          SELECT * : (no compute)
-                          Lateral View Forward
-                            Select Operator
-                              SELECT * : (no compute)
-                              expressions: _col0 (type: string), _col1 (type: array<string>)
-                              outputColumnNames: org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc, org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc
+                        Lateral View Forward
+                          Select Operator
+                            SELECT * : (no compute)
+                            expressions: _col0 (type: string), _col1 (type: array<string>)
+                            outputColumnNames: org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc, org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc
+                            Lateral View Join Operator
+                              outputColumnNames: _col0, _col1, _col2
+                              Select Operator
+                                expressions: _col0 (type: string), _col1 (type: array<string>), _col2 (type: string)
+                                outputColumnNames: _col0, _col1, _col2
+                                File Output Operator
+                                  compressed: false
+                                  table:
+                                      input format: org.apache.hadoop.mapred.TextInputFormat
+                                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          Select Operator
+                            expressions: _col1 (type: array<string>)
+                            outputColumnNames: _col0
+                            UDTF Operator
+                              function name: explode
                               Lateral View Join Operator
                                 outputColumnNames: _col0, _col1, _col2
                                 Select Operator
@@ -122,30 +136,14 @@ STAGE PLANS:
                                         input format: org.apache.hadoop.mapred.TextInputFormat
                                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            Select Operator
-                              expressions: _col1 (type: array<string>)
-                              outputColumnNames: _col0
-                              UDTF Operator
-                                function name: explode
-                                Lateral View Join Operator
-                                  outputColumnNames: _col0, _col1, _col2
-                                  Select Operator
-                                    expressions: _col0 (type: string), _col1 (type: array<string>), _col2 (type: string)
-                                    outputColumnNames: _col0, _col1, _col2
-                                    File Output Operator
-                                      compressed: false
-                                      table:
-                                          input format: org.apache.hadoop.mapred.TextInputFormat
-                                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
-        Map 5 
+        Map 4 
             Map Operator Tree:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (key is not null and (key = '8')) (type: boolean)
+                    predicate: (key is not null and (not (key = '8'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -157,17 +155,31 @@ STAGE PLANS:
                         1 key (type: string)
                       outputColumnNames: _col0, _col6
                       input vertices:
-                        0 Map 2
+                        0 Map 5
                       Select Operator
                         expressions: _col0 (type: string), _col6 (type: array<string>)
                         outputColumnNames: _col0, _col1
-                        Select Operator
-                          SELECT * : (no compute)
-                          Lateral View Forward
-                            Select Operator
-                              SELECT * : (no compute)
-                              expressions: _col0 (type: string), _col1 (type: array<string>)
-                              outputColumnNames: org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc, org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc
+                        Lateral View Forward
+                          Select Operator
+                            SELECT * : (no compute)
+                            expressions: _col0 (type: string), _col1 (type: array<string>)
+                            outputColumnNames: org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc, org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc
+                            Lateral View Join Operator
+                              outputColumnNames: _col0, _col1, _col2
+                              Select Operator
+                                expressions: _col0 (type: string), _col1 (type: array<string>), _col2 (type: string)
+                                outputColumnNames: _col0, _col1, _col2
+                                File Output Operator
+                                  compressed: false
+                                  table:
+                                      input format: org.apache.hadoop.mapred.TextInputFormat
+                                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          Select Operator
+                            expressions: _col1 (type: array<string>)
+                            outputColumnNames: _col0
+                            UDTF Operator
+                              function name: explode
                               Lateral View Join Operator
                                 outputColumnNames: _col0, _col1, _col2
                                 Select Operator
@@ -179,38 +191,22 @@ STAGE PLANS:
                                         input format: org.apache.hadoop.mapred.TextInputFormat
                                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            Select Operator
-                              expressions: _col1 (type: array<string>)
-                              outputColumnNames: _col0
-                              UDTF Operator
-                                function name: explode
-                                Lateral View Join Operator
-                                  outputColumnNames: _col0, _col1, _col2
-                                  Select Operator
-                                    expressions: _col0 (type: string), _col1 (type: array<string>), _col2 (type: string)
-                                    outputColumnNames: _col0, _col1, _col2
-                                    File Output Operator
-                                      compressed: false
-                                      table:
-                                          input format: org.apache.hadoop.mapred.TextInputFormat
-                                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
-        Union 4 
-            Vertex: Union 4
+        Union 3 
+            Vertex: Union 3
 
   Stage: Stage-3
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 2 
+        Map 5 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (key = '8')) (type: boolean)
+                    predicate: (key is not null and (not (key = '8'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out Sat Nov 29 03:44:22 2014
@@ -77,7 +77,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
+                    predicate: (key is not null and (key = '2')) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -92,7 +92,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Union 2 <- Map 1 (NONE, 0), Map 4 (NONE, 0), Map 6 (NONE, 0), Map 9 (NONE, 0)
+        Union 2 <- Map 1 (NONE, 0), Map 4 (NONE, 0), Map 7 (NONE, 0), Map 9 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -100,7 +100,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
+                    predicate: (key is not null and (key = '2')) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -117,16 +117,14 @@ STAGE PLANS:
                         expressions: _col0 (type: string), _col1 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2
                         Select Operator
-                          SELECT * : (no compute)
-                          Select Operator
-                            expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
-                            outputColumnNames: _col0, _col1, _col2
-                            File Output Operator
-                              compressed: false
-                              table:
-                                  input format: org.apache.hadoop.mapred.TextInputFormat
-                                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                          outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
+                            table:
+                                input format: org.apache.hadoop.mapred.TextInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 4 
@@ -151,24 +149,22 @@ STAGE PLANS:
                         expressions: _col0 (type: string), _col1 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2
                         Select Operator
-                          SELECT * : (no compute)
-                          Select Operator
-                            expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
-                            outputColumnNames: _col0, _col1, _col2
-                            File Output Operator
-                              compressed: false
-                              table:
-                                  input format: org.apache.hadoop.mapred.TextInputFormat
-                                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                          outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
+                            table:
+                                input format: org.apache.hadoop.mapred.TextInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
-        Map 6 
+        Map 7 
             Map Operator Tree:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (key = '2')) (type: boolean)
+                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -180,21 +176,19 @@ STAGE PLANS:
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col6
                       input vertices:
-                        1 Map 8
+                        1 Map 6
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2
                         Select Operator
-                          SELECT * : (no compute)
-                          Select Operator
-                            expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
-                            outputColumnNames: _col0, _col1, _col2
-                            File Output Operator
-                              compressed: false
-                              table:
-                                  input format: org.apache.hadoop.mapred.TextInputFormat
-                                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                          outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
+                            table:
+                                input format: org.apache.hadoop.mapred.TextInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 9 
@@ -214,21 +208,19 @@ STAGE PLANS:
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col6
                       input vertices:
-                        1 Map 7
+                        1 Map 8
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2
                         Select Operator
-                          SELECT * : (no compute)
-                          Select Operator
-                            expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
-                            outputColumnNames: _col0, _col1, _col2
-                            File Output Operator
-                              compressed: false
-                              table:
-                                  input format: org.apache.hadoop.mapred.TextInputFormat
-                                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
+                          outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: false
+                            table:
+                                input format: org.apache.hadoop.mapred.TextInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 2 
@@ -260,13 +252,13 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 8 
+        Map 6 
             Map Operator Tree:
                 TableScan
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (key = '2')) (type: boolean)
+                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -282,7 +274,7 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 7 
+        Map 8 
             Map Operator Tree:
                 TableScan
                   alias: b

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out Sat Nov 29 03:44:22 2014
@@ -65,7 +65,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -88,7 +88,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -104,14 +104,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -119,7 +117,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -135,14 +133,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 2 
@@ -158,7 +154,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13')))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (not ((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and (val = '13'))))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out Sat Nov 29 03:44:22 2014
@@ -84,7 +84,7 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 1 
+        Map 2 
             Map Operator Tree:
                 TableScan
                   alias: b
@@ -101,7 +101,7 @@ STAGE PLANS:
                         1 key (type: string)
             Local Work:
               Map Reduce Local Work
-        Map 2 
+        Map 3 
             Map Operator Tree:
                 TableScan
                   alias: c
@@ -123,7 +123,7 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 3 
+        Map 1 
             Map Operator Tree:
                 TableScan
                   alias: a
@@ -142,7 +142,7 @@ STAGE PLANS:
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col5, _col6
                       input vertices:
-                        1 Map 1
+                        1 Map 2
                       Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                       Map Join Operator
                         condition map:
@@ -155,7 +155,7 @@ STAGE PLANS:
                           1 val (type: string)
                         outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
                         input vertices:
-                          1 Map 2
+                          1 Map 3
                         Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                         Select Operator
                           expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out Sat Nov 29 03:44:22 2014
@@ -95,7 +95,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
+                    predicate: (key is not null and (key = '2')) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -110,7 +110,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 1), Union 2 (PARTITION-LEVEL SORT, 1)
+        Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 1), Union 2 (PARTITION-LEVEL SORT, 1)
         Union 2 <- Map 1 (NONE, 0), Map 7 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:
@@ -119,7 +119,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (not (key = '2'))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (key = '2')) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -132,16 +132,14 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col5, _col6
                       input vertices:
                         1 Map 4
-                      Select Operator
-                        SELECT * : (no compute)
-                        Reduce Output Operator
-                          key expressions: _col1 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col1 (type: string)
-                          value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: string)
+                        value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
             Local Work:
               Map Reduce Local Work
-        Map 6 
+        Map 5 
             Map Operator Tree:
                 TableScan
                   alias: c
@@ -160,7 +158,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (key = '2')) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (not (key = '2'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -172,14 +170,12 @@ STAGE PLANS:
                         1 key (type: string)
                       outputColumnNames: _col0, _col1, _col5, _col6
                       input vertices:
-                        1 Map 5
-                      Select Operator
-                        SELECT * : (no compute)
-                        Reduce Output Operator
-                          key expressions: _col1 (type: string)
-                          sort order: +
-                          Map-reduce partition columns: _col1 (type: string)
-                          value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
+                        1 Map 6
+                      Reduce Output Operator
+                        key expressions: _col1 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: string)
+                        value expressions: _col0 (type: string), _col5 (type: string), _col6 (type: string)
             Local Work:
               Map Reduce Local Work
         Reducer 3 
@@ -210,13 +206,13 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 5 
+        Map 6 
             Map Operator Tree:
                 TableScan
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (key = '2')) (type: boolean)
+                    predicate: (key is not null and (not (key = '2'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out Sat Nov 29 03:44:22 2014
@@ -103,8 +103,8 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
+                    Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {key} {val}
@@ -126,7 +126,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
+                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -142,14 +142,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -157,7 +155,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
+                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -173,14 +171,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 2 
@@ -196,8 +192,8 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
-                    Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
+                    Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {key} {val}
@@ -259,8 +255,8 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                    predicate: ((key = 2) or (key = 3)) (type: boolean)
+                    Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {val}
@@ -282,7 +278,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
+                    predicate: ((key = 2) or (key = 3)) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -298,14 +294,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 4 
@@ -313,7 +307,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: ((key = 2) or (key = 3)) (type: boolean)
+                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -329,14 +323,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 3 
@@ -352,8 +344,8 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key = 2) or (key = 3)) (type: boolean)
-                    Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
+                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 {val}
@@ -417,8 +409,8 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
+                    Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 
@@ -441,7 +433,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
+                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -453,16 +445,13 @@ STAGE PLANS:
                         1 key (type: int)
                       input vertices:
                         1 Map 4
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Map 6 
@@ -470,7 +459,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
+                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -482,16 +471,13 @@ STAGE PLANS:
                         1 key (type: int)
                       input vertices:
                         1 Map 5
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Reducer 3 
@@ -525,8 +511,8 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and ((key = 2) or (key = 3))) (type: boolean)
-                    Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (key is not null and (not ((key = 2) or (key = 3)))) (type: boolean)
+                    Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 
@@ -577,8 +563,8 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+                    predicate: ((key = 2) or (key = 3)) (type: boolean)
+                    Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 
@@ -601,7 +587,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
+                    predicate: ((key = 2) or (key = 3)) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -613,16 +599,13 @@ STAGE PLANS:
                         1 key (type: int)
                       input vertices:
                         0 Map 1
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -630,7 +613,7 @@ STAGE PLANS:
                 TableScan
                   alias: b
                   Filter Operator
-                    predicate: ((key = 2) or (key = 3)) (type: boolean)
+                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Right Outer Join0 to 1
@@ -642,16 +625,13 @@ STAGE PLANS:
                         1 key (type: int)
                       input vertices:
                         0 Map 6
-                      Select Operator
-                        Select Operator
-                          SELECT * : (no compute)
-                          Group By Operator
-                            aggregations: count(1)
-                            mode: hash
-                            outputColumnNames: _col0
-                            Reduce Output Operator
-                              sort order: 
-                              value expressions: _col0 (type: bigint)
+                      Group By Operator
+                        aggregations: count(1)
+                        mode: hash
+                        outputColumnNames: _col0
+                        Reduce Output Operator
+                          sort order: 
+                          value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
         Reducer 4 
@@ -685,8 +665,8 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key = 2) or (key = 3)) (type: boolean)
-                    Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: NONE
+                    predicate: (not ((key = 2) or (key = 3))) (type: boolean)
+                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
                         0 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out?rev=1642395&r1=1642394&r2=1642395&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out Sat Nov 29 03:44:22 2014
@@ -65,7 +65,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions:
@@ -88,7 +88,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -104,14 +104,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Map 5 
@@ -119,7 +117,7 @@ STAGE PLANS:
                 TableScan
                   alias: a
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -135,14 +133,12 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
                         outputColumnNames: _col0, _col1, _col2, _col3
-                        Select Operator
-                          SELECT * : (no compute)
-                          File Output Operator
-                            compressed: false
-                            table:
-                                input format: org.apache.hadoop.mapred.TextInputFormat
-                                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        File Output Operator
+                          compressed: false
+                          table:
+                              input format: org.apache.hadoop.mapred.TextInputFormat
+                              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
             Local Work:
               Map Reduce Local Work
         Union 2 
@@ -158,7 +154,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column stats: NONE
                   Filter Operator
-                    predicate: ((key is not null and val is not null) and (((key = '2') and (val = '12')) or (key = '3'))) (type: boolean)
+                    predicate: ((key is not null and val is not null) and (not (((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Spark HashTable Sink Operator
                       condition expressions: