You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/10/22 22:21:33 UTC

svn commit: r1633710 [1/5] - in /hive/branches/branch-0.14: hbase-handler/src/test/results/positive/ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/test/results/clientpositive/ ql/src/test/results/c...

Author: hashutosh
Date: Wed Oct 22 20:21:31 2014
New Revision: 1633710

URL: http://svn.apache.org/r1633710
Log:
HIVE-8531 : Fold is not null filter if there are other comparison filter present on same column (Ashutosh Chauhan via Harish Butani)

Modified:
    hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_queries.q.out
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join11.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join12.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join14.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join16.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join27.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/decimal_udf.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join11.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join12.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join13.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join14.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join16.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join34.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join38.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_vc.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_gby_join.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join3.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_random.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/regex_col.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/sample8.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/semijoin.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_exists.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_in.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_in_having.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/subquery_views.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_10.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/subquery_in.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/union20.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/union24.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out

Modified: hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_queries.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_queries.q.out (original)
+++ hive/branches/branch-0.14/hbase-handler/src/test/results/positive/hbase_queries.q.out Wed Oct 22 20:21:31 2014
@@ -271,7 +271,7 @@ STAGE PLANS:
             alias: hbase_table_2
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
-              predicate: ((key < 120) and key is not null) (type: boolean)
+              predicate: (key < 120) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
@@ -287,7 +287,7 @@ STAGE PLANS:
             alias: hbase_table_1
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             Filter Operator
-              predicate: ((100 < key) and key is not null) (type: boolean)
+              predicate: (100 < key) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
                 expressions: key (type: int)

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java Wed Oct 22 20:21:31 2014
@@ -64,9 +64,11 @@ import org.apache.hadoop.hive.ql.plan.Ta
 import org.apache.hadoop.hive.ql.udf.UDFType;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDF;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDF.DeferredJavaObject;
+import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBaseCompare;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPAnd;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPEqual;
+import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNotNull;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPNull;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPOr;
 import org.apache.hadoop.hive.serde.serdeConstants;
@@ -372,17 +374,30 @@ public final class ConstantPropagateProc
     if (udf instanceof GenericUDFOPAnd) {
       for (int i = 0; i < 2; i++) {
         ExprNodeDesc childExpr = newExprs.get(i);
+        ExprNodeDesc other = newExprs.get(Math.abs(i - 1));
         if (childExpr instanceof ExprNodeConstantDesc) {
           ExprNodeConstantDesc c = (ExprNodeConstantDesc) childExpr;
           if (Boolean.TRUE.equals(c.getValue())) {
 
             // if true, prune it
-            return newExprs.get(Math.abs(i - 1));
+            return other;
           } else {
 
             // if false return false
             return childExpr;
           }
+        } else if (childExpr instanceof ExprNodeGenericFuncDesc &&
+            ((ExprNodeGenericFuncDesc)childExpr).getGenericUDF() instanceof GenericUDFOPNotNull &&
+            childExpr.getChildren().get(0) instanceof ExprNodeColumnDesc && other instanceof ExprNodeGenericFuncDesc
+            && ((ExprNodeGenericFuncDesc)other).getGenericUDF() instanceof GenericUDFBaseCompare
+            && other.getChildren().size() == 2) {
+          ExprNodeColumnDesc colDesc = getColumnExpr(other.getChildren().get(0));
+          if (null == colDesc) {
+            colDesc = getColumnExpr(other.getChildren().get(1));
+          }
+          if (null != colDesc && colDesc.isSame(childExpr.getChildren().get(0))) {
+            return other;
+          }
         }
       }
     }

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Wed Oct 22 20:21:31 2014
@@ -2662,7 +2662,10 @@ public class SemanticAnalyzer extends Ba
     if (joinKeys == null || joinKeys.length == 0) {
       return input;
     }
-
+    Map<Integer, ExprNodeDesc> hashes = new HashMap<Integer, ExprNodeDesc>();
+    if (input instanceof FilterOperator) {
+      ExprNodeDescUtils.getExprNodeColumnDesc(Arrays.asList(((FilterDesc)input.getConf()).getPredicate()), hashes);
+    }
     ExprNodeDesc filterPred = null;
     List<Boolean> nullSafes = joinTree.getNullSafes();
     for (int i = 0; i < joinKeys.length; i++) {
@@ -2672,6 +2675,10 @@ public class SemanticAnalyzer extends Ba
         // virtual column, since those columns can never be null.
         continue;
       }
+      if(null != hashes.get(joinKeys[i].hashCode())) {
+        // there is already a predicate on this src.
+        continue;
+      }
       List<ExprNodeDesc> args = new ArrayList<ExprNodeDesc>();
       args.add(joinKeys[i]);
       ExprNodeDesc nextExpr = ExprNodeGenericFuncDesc.newInstance(

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join11.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join11.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join11.q.out Wed Oct 22 20:21:31 2014
@@ -32,12 +32,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -53,12 +53,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -69,11 +69,11 @@ STAGE PLANS:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col3
-                  Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col3 (type: string)
                     outputColumnNames: _col0, _col3
-                    Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(hash(_col0,_col3))
                       mode: hash

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join12.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join12.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join12.q.out Wed Oct 22 20:21:31 2014
@@ -41,12 +41,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 80) and key is not null) and (key < 100)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((key < 80) and (key < 100)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -61,12 +61,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: (((key < 100) and (key < 80)) and key is not null) (type: boolean)
+              Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -84,12 +84,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 100) and key is not null) and (key < 80)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((key < 100) and (key < 80)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -103,11 +103,11 @@ STAGE PLANS:
                     1 _col0 (type: string)
                     2 _col0 (type: string)
                   outputColumnNames: _col0, _col3
-                  Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col3 (type: string)
                     outputColumnNames: _col0, _col3
-                    Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(hash(_col0,_col3))
                       mode: hash

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join13.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join13.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join13.q.out Wed Oct 22 20:21:31 2014
@@ -41,12 +41,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -80,12 +80,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -96,10 +96,10 @@ STAGE PLANS:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
                   outputColumnNames: _col0, _col2, _col3
-                  Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (_col0 + _col2) is not null (type: boolean)
-                    Statistics: Num rows: 46 Data size: 489 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -110,11 +110,11 @@ STAGE PLANS:
                         0 (_col0 + _col2) (type: double)
                         1 UDFToDouble(_col0) (type: double)
                       outputColumnNames: _col0, _col3
-                      Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 100 Data size: 1065 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: string), _col3 (type: string)
                         outputColumnNames: _col0, _col3
-                        Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 100 Data size: 1065 Basic stats: COMPLETE Column stats: NONE
                         Group By Operator
                           aggregations: sum(hash(_col0,_col3))
                           mode: hash

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join14.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join14.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join14.q.out Wed Oct 22 20:21:31 2014
@@ -37,8 +37,8 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key > 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key > 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
                   0 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join16.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join16.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join16.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join16.q.out Wed Oct 22 20:21:31 2014
@@ -32,12 +32,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((((key > 10) and (key > 20)) and key is not null) and value is not null) and (value < 200)) (type: boolean)
-              Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((((key > 10) and value is not null) and (key > 20)) and (value < 200)) (type: boolean)
+              Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -53,7 +53,7 @@ STAGE PLANS:
             alias: tab
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((((key > 20) and key is not null) and value is not null) and (value < 200)) (type: boolean)
+              predicate: ((((key > 20) and value is not null) and key is not null) and (value < 200)) (type: boolean)
               Statistics: Num rows: 14 Data size: 148 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join27.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join27.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join27.q.out Wed Oct 22 20:21:31 2014
@@ -37,32 +37,32 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 200) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 200) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: key, value
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator
                   keys: key (type: string), value (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
-                    Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -82,12 +82,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 200) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 200) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -101,7 +101,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Union
-              Statistics: Num rows: 124 Data size: 1316 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 249 Data size: 2644 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -111,9 +111,9 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
-                Statistics: Num rows: 136 Data size: 1447 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 273 Data size: 2908 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  Statistics: Num rows: 136 Data size: 1447 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 273 Data size: 2908 Basic stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count(1)
                     mode: hash
@@ -129,14 +129,14 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 200) and key is not null) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 200) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 Union
-                  Statistics: Num rows: 124 Data size: 1316 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 249 Data size: 2644 Basic stats: COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -146,9 +146,9 @@ STAGE PLANS:
                     keys:
                       0 _col0 (type: string)
                       1 _col0 (type: string)
-                    Statistics: Num rows: 136 Data size: 1447 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 273 Data size: 2908 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      Statistics: Num rows: 136 Data size: 1447 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 273 Data size: 2908 Basic stats: COMPLETE Column stats: NONE
                       Group By Operator
                         aggregations: count(1)
                         mode: hash

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join29.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join29.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join29.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join29.q.out Wed Oct 22 20:21:31 2014
@@ -3551,8 +3551,8 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > 10) and key is not null) and (key < 10)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((key > 10) and (key < 10)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
                   0 {value}
@@ -3567,8 +3567,8 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key < 10) and key is not null) and (key > 10)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((key < 10) and (key > 10)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
                   0 {value}
@@ -3586,8 +3586,8 @@ STAGE PLANS:
             alias: src3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (((key > 10) and key is not null) and (key < 10)) (type: boolean)
-              Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column stats: NONE
+              predicate: ((key > 10) and (key < 10)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -3601,25 +3601,25 @@ STAGE PLANS:
                   1 key (type: string)
                   2 key (type: string)
                 outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
-                Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
                 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
-                  Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
                     sort order: ++++++
-                    Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string), KEY.reducesinkkey4 (type: string), KEY.reducesinkkey5 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 59 Data size: 629 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 121 Data size: 1284 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out Wed Oct 22 20:21:31 2014
@@ -613,7 +613,7 @@ STAGE PLANS:
           TableScan
             alias: b
             Filter Operator
-              predicate: (key is not null and (key > 100)) (type: boolean)
+              predicate: (key > 100) (type: boolean)
               HashTable Sink Operator
                 condition expressions:
                   0 {key} {value}
@@ -745,7 +745,7 @@ STAGE PLANS:
               key expressions: _col1 (type: string)
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
-              Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string)
           TableScan
             alias: c
@@ -808,7 +808,7 @@ STAGE PLANS:
           TableScan
             alias: b
             Filter Operator
-              predicate: (key is not null and (key > 100)) (type: boolean)
+              predicate: (key > 100) (type: boolean)
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -835,13 +835,13 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key > 100)) (type: boolean)
-              Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key > 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
                 sort order: +
                 Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -862,7 +862,7 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
             table:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out Wed Oct 22 20:21:31 2014
@@ -506,12 +506,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -853,12 +853,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1072,12 +1072,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1167,12 +1167,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out Wed Oct 22 20:21:31 2014
@@ -83,12 +83,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -104,18 +104,18 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Union
-                  Statistics: Num rows: 4 Data size: 28 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 4 Data size: 28 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -125,9 +125,9 @@ STAGE PLANS:
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)
-                      Statistics: Num rows: 4 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 6 Data size: 46 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 4 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 46 Basic stats: COMPLETE Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -143,18 +143,18 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Union
-                  Statistics: Num rows: 4 Data size: 28 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 4 Data size: 28 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 42 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -164,9 +164,9 @@ STAGE PLANS:
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)
-                      Statistics: Num rows: 4 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 6 Data size: 46 Basic stats: COMPLETE Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 4 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 46 Basic stats: COMPLETE Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -272,24 +272,24 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: key
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   bucketGroup: true
                   keys: key (type: int)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -321,12 +321,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   condition expressions:
                     0 
@@ -348,9 +348,9 @@ STAGE PLANS:
               keys:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
-              Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 3 Data size: 23 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 23 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out Wed Oct 22 20:21:31 2014
@@ -699,12 +699,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1046,12 +1046,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1264,12 +1264,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1444,12 +1444,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3012,7 +3012,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3030,7 +3030,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3079,7 +3079,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3097,7 +3097,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3142,12 +3142,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3779,7 +3779,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
+              predicate: (key < 8) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3797,7 +3797,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
+              predicate: (key < 8) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3846,7 +3846,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
+              predicate: (key < 8) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3864,7 +3864,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
+              predicate: (key < 8) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -3909,12 +3909,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 8) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4025,7 +4025,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4074,7 +4074,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4134,12 +4134,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4233,7 +4233,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4312,7 +4312,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4467,7 +4467,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4484,7 +4484,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4504,7 +4504,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4559,7 +4559,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4576,7 +4576,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4596,7 +4596,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4651,7 +4651,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4668,7 +4668,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4688,7 +4688,7 @@ STAGE PLANS:
           TableScan
             alias: a
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
+              predicate: (key < 6) (type: boolean)
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
@@ -4736,12 +4736,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: ((key < 6) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out?rev=1633710&r1=1633709&r2=1633710&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out Wed Oct 22 20:21:31 2014
@@ -473,22 +473,22 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -498,11 +498,11 @@ STAGE PLANS:
             0 {VALUE._col0}
             1 
           outputColumnNames: _col1
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string)
             outputColumnNames: _col1
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -518,15 +518,15 @@ STAGE PLANS:
               key expressions: _col1 (type: string)
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
-              Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: '20' (type: string), KEY.reducesinkkey0 (type: string), '20' (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -566,23 +566,23 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -592,11 +592,11 @@ STAGE PLANS:
             0 {VALUE._col0}
             1 {VALUE._col0}
           outputColumnNames: _col1, _col6
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col6 (type: string)
             outputColumnNames: _col1, _col3
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -612,16 +612,16 @@ STAGE PLANS:
               key expressions: _col1 (type: string)
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
-              Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: '20' (type: string), KEY.reducesinkkey0 (type: string), '20' (type: string), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -661,23 +661,23 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -687,11 +687,11 @@ STAGE PLANS:
             0 {VALUE._col0}
             1 {VALUE._col0}
           outputColumnNames: _col1, _col6
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col6 (type: string)
             outputColumnNames: _col1, _col3
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -706,16 +706,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: '20' (type: string)
               sort order: +
-              Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col1 (type: string), _col3 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: '20' (type: string), VALUE._col0 (type: string), '20' (type: string), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -755,22 +755,22 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
-              predicate: (key is not null and (key = 20)) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+              predicate: (key = 20) (type: boolean)
+              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -780,11 +780,11 @@ STAGE PLANS:
             0 {VALUE._col0}
             1 
           outputColumnNames: _col1
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
             expressions: _col1 (type: string), '20' (type: string)
             outputColumnNames: _col1, _col2
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -799,16 +799,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: '20' (type: string)
               sort order: +
-              Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col1 (type: string), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: '20' (type: string), VALUE._col0 (type: string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat