You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/09/27 19:19:10 UTC

svn commit: r1391108 [2/2] - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/optimizer/ java/org/apache/hadoop/hive/ql/plan/ java/org/apache/hadoop/hive/ql/ppd/ test/queries/clientpositive/ test/results/clientpositive/

Modified: hive/trunk/ql/src/test/results/clientpositive/join13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join13.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join13.q.out Thu Sep 27 17:19:08 2012
@@ -59,27 +59,31 @@ STAGE PLANS:
         src2:src 
           TableScan
             alias: src
-            Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-              outputColumnNames: _col0, _col1
-              Reduce Output Operator
-                key expressions:
-                      expr: _col0
-                      type: string
-                sort order: +
-                Map-reduce partition columns:
-                      expr: _col0
-                      type: string
-                tag: 1
-                value expressions:
-                      expr: _col0
+            Filter Operator
+              predicate:
+                  expr: (key < 100.0)
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: key
                       type: string
-                      expr: _col1
+                      expr: value
                       type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                  tag: 1
+                  value expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join14.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join14.q.out Thu Sep 27 17:19:08 2012
@@ -45,18 +45,22 @@ STAGE PLANS:
         srcpart 
           TableScan
             alias: srcpart
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (key > 100.0)
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 1
+                value expressions:
+                      expr: value
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join16.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join16.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join16.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join16.q.out Thu Sep 27 17:19:08 2012
@@ -48,7 +48,7 @@ STAGE PLANS:
             alias: tab
             Filter Operator
               predicate:
-                  expr: (value < 200.0)
+                  expr: ((key > 20.0) and (value < 200.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/join20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join20.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join20.q.out Thu Sep 27 17:19:08 2012
@@ -42,20 +42,24 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (key < 10.0)
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 1
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
         src3 
           TableScan
             alias: src3
@@ -740,7 +744,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 15.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:
@@ -761,7 +765,7 @@ STAGE PLANS:
             alias: src2
             Filter Operator
               predicate:
-                  expr: (key < 15.0)
+                  expr: ((key < 15.0) and (key < 10.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/join40.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join40.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join40.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join40.q.out Thu Sep 27 17:19:08 2012
@@ -1825,20 +1825,24 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (key < 10.0)
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 1
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
         src3 
           TableScan
             alias: src3
@@ -2523,7 +2527,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 15.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:
@@ -2544,7 +2548,7 @@ STAGE PLANS:
             alias: src2
             Filter Operator
               predicate:
-                  expr: (key < 15.0)
+                  expr: ((key < 15.0) and (key < 10.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join_nullsafe.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join_nullsafe.q.out Thu Sep 27 17:19:08 2012
@@ -1588,3 +1588,112 @@ NULL	135	NULL	135
 148	NULL	110	NULL
 148	NULL	148	NULL
 200	200	200	200
+PREHOOK: query: --HIVE-3315 join predicate transitive
+explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+PREHOOK: type: QUERY
+POSTHOOK: query: --HIVE-3315 join predicate transitive
+explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+POSTHOOK: type: QUERY
+ABSTRACT SYNTAX TREE:
+  (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF (TOK_TABNAME myinput1) a) (TOK_TABREF (TOK_TABNAME myinput1) b) (AND (<=> (. (TOK_TABLE_OR_COL a) key) (. (TOK_TABLE_OR_COL b) value)) (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL a) key))))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
+
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-1
+    Map Reduce
+      Alias -> Map Operator Tree:
+        a 
+          TableScan
+            alias: a
+            Filter Operator
+              predicate:
+                  expr: key is null
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: int
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: int
+                tag: 0
+                value expressions:
+                      expr: key
+                      type: int
+                      expr: value
+                      type: int
+        b 
+          TableScan
+            alias: b
+            Filter Operator
+              predicate:
+                  expr: value is null
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: value
+                      type: int
+                sort order: +
+                Map-reduce partition columns:
+                      expr: value
+                      type: int
+                tag: 1
+                value expressions:
+                      expr: key
+                      type: int
+                      expr: value
+                      type: int
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+          condition expressions:
+            0 {VALUE._col0} {VALUE._col1}
+            1 {VALUE._col0} {VALUE._col1}
+          handleSkewJoin: false
+          nullSafes: [true]
+          outputColumnNames: _col0, _col1, _col4, _col5
+          Select Operator
+            expressions:
+                  expr: _col0
+                  type: int
+                  expr: _col1
+                  type: int
+                  expr: _col4
+                  type: int
+                  expr: _col5
+                  type: int
+            outputColumnNames: _col0, _col1, _col2, _col3
+            File Output Operator
+              compressed: false
+              GlobalTableId: 0
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+
+
+PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+PREHOOK: type: QUERY
+PREHOOK: Input: default@myinput1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@myinput1
+#### A masked pattern was here ####
+NULL	NULL	NULL	NULL
+NULL	NULL	10	NULL
+NULL	NULL	48	NULL
+NULL	10	NULL	NULL
+NULL	10	10	NULL
+NULL	10	48	NULL
+NULL	35	NULL	NULL
+NULL	35	10	NULL
+NULL	35	48	NULL

Modified: hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out Thu Sep 27 17:19:08 2012
@@ -77,7 +77,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 300.0))
                   type: boolean
               HashTable Sink Operator
                 condition expressions:
@@ -97,21 +97,25 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            HashTable Sink Operator
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
-              filter predicates:
-                0 
-                1 {(key > 10.0)}
-                2 
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 2
+            Filter Operator
+              predicate:
+                  expr: (key < 300.0)
+                  type: boolean
+              HashTable Sink Operator
+                condition expressions:
+                  0 {key} {value}
+                  1 {key} {value}
+                  2 {key} {value}
+                filter predicates:
+                  0 
+                  1 {(key > 10.0)}
+                  2 
+                handleSkewJoin: false
+                keys:
+                  0 [Column[key]]
+                  1 [Column[key]]
+                  2 [Column[key]]
+                Position of Big Table: 2
 
   Stage: Stage-1
     Map Reduce
@@ -304,7 +308,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 300.0))
                   type: boolean
               HashTable Sink Operator
                 condition expressions:
@@ -350,46 +354,50 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Map Join Operator
-              condition map:
-                   Right Outer Join0 to 1
-                   Inner Join 1 to 2
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
-              filter predicates:
-                0 
-                1 {(key > 10.0)}
-                2 
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
-              Position of Big Table: 1
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                      expr: _col4
-                      type: string
-                      expr: _col5
-                      type: string
-                      expr: _col8
-                      type: string
-                      expr: _col9
-                      type: string
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+            Filter Operator
+              predicate:
+                  expr: (key < 300.0)
+                  type: boolean
+              Map Join Operator
+                condition map:
+                     Right Outer Join0 to 1
+                     Inner Join 1 to 2
+                condition expressions:
+                  0 {key} {value}
+                  1 {key} {value}
+                  2 {key} {value}
+                filter predicates:
+                  0 
+                  1 {(key > 10.0)}
+                  2 
+                handleSkewJoin: false
+                keys:
+                  0 [Column[key]]
+                  1 [Column[key]]
+                  2 [Column[key]]
+                outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+                Position of Big Table: 1
+                Select Operator
+                  expressions:
+                        expr: _col0
+                        type: string
+                        expr: _col1
+                        type: string
+                        expr: _col4
+                        type: string
+                        expr: _col5
+                        type: string
+                        expr: _col8
+                        type: string
+                        expr: _col9
+                        type: string
+                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 0
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
       Local Work:
         Map Reduce Local Work
 
@@ -444,7 +452,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 300.0))
                   type: boolean
               HashTable Sink Operator
                 condition expressions:
@@ -464,21 +472,25 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            HashTable Sink Operator
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
-              filter predicates:
-                0 
-                1 {(key > 10.0)}
-                2 
-              handleSkewJoin: false
-              keys:
-                0 [Column[key]]
-                1 [Column[key]]
-                2 [Column[key]]
-              Position of Big Table: 2
+            Filter Operator
+              predicate:
+                  expr: (key < 300.0)
+                  type: boolean
+              HashTable Sink Operator
+                condition expressions:
+                  0 {key} {value}
+                  1 {key} {value}
+                  2 {key} {value}
+                filter predicates:
+                  0 
+                  1 {(key > 10.0)}
+                  2 
+                handleSkewJoin: false
+                keys:
+                  0 [Column[key]]
+                  1 [Column[key]]
+                  2 [Column[key]]
+                Position of Big Table: 2
 
   Stage: Stage-6
     Map Reduce
@@ -541,7 +553,7 @@ STAGE PLANS:
             alias: src1
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: ((key < 10.0) and (key < 300.0))
                   type: boolean
               Reduce Output Operator
                 key expressions:
@@ -560,20 +572,24 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-              sort order: +
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (key < 300.0)
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                sort order: +
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                tag: 1
+                value expressions:
+                      expr: key
+                      type: string
+                      expr: value
+                      type: string
         src3 
           TableScan
             alias: src3

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_gby_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_gby_join.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_gby_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_gby_join.q.out Thu Sep 27 17:19:08 2012
@@ -71,7 +71,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key > '2') and (key <> '4')) and (key > '20'))
+                  expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
               Filter Operator
                 predicate:
@@ -82,18 +82,22 @@ STAGE PLANS:
                         expr: key
                         type: string
                   outputColumnNames: _col0
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 1
-                    value expressions:
-                          expr: _col0
-                          type: string
+                  Filter Operator
+                    predicate:
+                        expr: (_col0 < '400')
+                        type: boolean
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: string
+                      tag: 1
+                      value expressions:
+                            expr: _col0
+                            type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -238,7 +242,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key > '2') and (key <> '4')) and (key > '20'))
+                  expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_join.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_join.q.out Thu Sep 27 17:19:08 2012
@@ -68,7 +68,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key > '2') and (key <> '4')) and (key > '20'))
+                  expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
               Filter Operator
                 predicate:
@@ -81,20 +81,24 @@ STAGE PLANS:
                         expr: value
                         type: string
                   outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+                  Filter Operator
+                    predicate:
+                        expr: (_col0 < '400')
+                        type: boolean
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: string
+                      tag: 1
+                      value expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -627,7 +631,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key > '2') and (key <> '4')) and (key > '20'))
+                  expr: ((((key > '2') and (key < '400')) and (key <> '4')) and (key > '20'))
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_join2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_join2.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_join2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_join2.q.out Thu Sep 27 17:19:08 2012
@@ -75,7 +75,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key <> '305') and (key <> '14')) and (key <> '311'))
+                  expr: ((((key <> '305') and (key < '400')) and (key <> '14')) and (key <> '311'))
                   type: boolean
               Filter Operator
                 predicate:
@@ -88,20 +88,24 @@ STAGE PLANS:
                         expr: value
                         type: string
                   outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+                  Filter Operator
+                    predicate:
+                        expr: (_col0 < '400')
+                        type: boolean
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: string
+                      tag: 1
+                      value expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1815,7 +1819,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (((key <> '305') and (key <> '14')) and (key <> '311'))
+                  expr: ((((key <> '305') and (key < '400')) and (key <> '14')) and (key <> '311'))
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/ppd_join3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ppd_join3.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ppd_join3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ppd_join3.q.out Thu Sep 27 17:19:08 2012
@@ -74,7 +74,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: ((((key <> '12') and (key <> '4')) and (key > '0')) and (key <> '1'))
+                  expr: (((((key <> '12') and (key < '400')) and (key <> '4')) and (key > '0')) and (key <> '1'))
                   type: boolean
               Filter Operator
                 predicate:
@@ -87,26 +87,30 @@ STAGE PLANS:
                         expr: value
                         type: string
                   outputColumnNames: _col0, _col1
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 1
-                    value expressions:
-                          expr: _col0
-                          type: string
-                          expr: _col1
-                          type: string
+                  Filter Operator
+                    predicate:
+                        expr: (_col0 < '400')
+                        type: boolean
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: string
+                      tag: 1
+                      value expressions:
+                            expr: _col0
+                            type: string
+                            expr: _col1
+                            type: string
         src3:src 
           TableScan
             alias: src
             Filter Operator
               predicate:
-                  expr: ((((key <> '13') and (key <> '1')) and (key > '0')) and (key <> '4'))
+                  expr: (((((key <> '13') and (key < '400')) and (key <> '1')) and (key > '0')) and (key <> '4'))
                   type: boolean
               Filter Operator
                 predicate:
@@ -117,18 +121,22 @@ STAGE PLANS:
                         expr: key
                         type: string
                   outputColumnNames: _col0
-                  Reduce Output Operator
-                    key expressions:
-                          expr: _col0
-                          type: string
-                    sort order: +
-                    Map-reduce partition columns:
-                          expr: _col0
-                          type: string
-                    tag: 2
-                    value expressions:
-                          expr: _col0
-                          type: string
+                  Filter Operator
+                    predicate:
+                        expr: (_col0 < '400')
+                        type: boolean
+                    Reduce Output Operator
+                      key expressions:
+                            expr: _col0
+                            type: string
+                      sort order: +
+                      Map-reduce partition columns:
+                            expr: _col0
+                            type: string
+                      tag: 2
+                      value expressions:
+                            expr: _col0
+                            type: string
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1832,7 +1840,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: ((((key <> '12') and (key <> '4')) and (key > '0')) and (key <> '1'))
+                  expr: (((((key <> '12') and (key < '400')) and (key <> '4')) and (key > '0')) and (key <> '1'))
                   type: boolean
               Select Operator
                 expressions:
@@ -1860,7 +1868,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: ((((key <> '13') and (key <> '1')) and (key > '0')) and (key <> '4'))
+                  expr: (((((key <> '13') and (key < '400')) and (key <> '1')) and (key > '0')) and (key <> '4'))
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out Thu Sep 27 17:19:08 2012
@@ -251,28 +251,32 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
-            Reduce Output Operator
-              key expressions:
-                    expr: key
-                    type: string
-                    expr: hr
-                    type: string
-                    expr: ds
-                    type: string
-              sort order: +++
-              Map-reduce partition columns:
-                    expr: key
-                    type: string
-                    expr: hr
-                    type: string
-                    expr: ds
-                    type: string
-              tag: 1
-              value expressions:
-                    expr: ds
-                    type: string
-                    expr: hr
-                    type: string
+            Filter Operator
+              predicate:
+                  expr: (key = 103.0)
+                  type: boolean
+              Reduce Output Operator
+                key expressions:
+                      expr: key
+                      type: string
+                      expr: hr
+                      type: string
+                      expr: ds
+                      type: string
+                sort order: +++
+                Map-reduce partition columns:
+                      expr: key
+                      type: string
+                      expr: hr
+                      type: string
+                      expr: ds
+                      type: string
+                tag: 1
+                value expressions:
+                      expr: ds
+                      type: string
+                      expr: hr
+                      type: string
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1391108&r1=1391107&r2=1391108&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out Thu Sep 27 17:19:08 2012
@@ -1191,7 +1191,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (key < 100.0)
+                  expr: ((key < 100.0) and (key < 80.0))
                   type: boolean
               Select Operator
                 expressions:
@@ -1213,31 +1213,35 @@ STAGE PLANS:
         src2:src 
           TableScan
             alias: src
-            Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-              outputColumnNames: _col0, _col1
-              Reduce Output Operator
-                key expressions:
-                      expr: _col0
-                      type: string
-                sort order: +
-                Map-reduce partition columns:
-                      expr: _col0
+            Filter Operator
+              predicate:
+                  expr: ((key < 100.0) and (key < 80.0))
+                  type: boolean
+              Select Operator
+                expressions:
+                      expr: key
                       type: string
-                tag: 1
-                value expressions:
-                      expr: _col1
+                      expr: value
                       type: string
+                outputColumnNames: _col0, _col1
+                Reduce Output Operator
+                  key expressions:
+                        expr: _col0
+                        type: string
+                  sort order: +
+                  Map-reduce partition columns:
+                        expr: _col0
+                        type: string
+                  tag: 1
+                  value expressions:
+                        expr: _col1
+                        type: string
         src3:src 
           TableScan
             alias: src
             Filter Operator
               predicate:
-                  expr: (key < 80.0)
+                  expr: ((key < 80.0) and (key < 100.0))
                   type: boolean
               Select Operator
                 expressions: