svn commit: r1535640 - /hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java

[gu...@apache.org]

Author: gunther
Date: Fri Oct 25 05:20:40 2013
New Revision: 1535640

URL: http://svn.apache.org/r1535640
Log:
HIVE-5651: union_view.q is failing on tez branch (Gunther Hagleitner)

Modified:
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java?rev=1535640&r1=1535639&r2=1535640&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java Fri Oct 25 05:20:40 2013
@@ -260,7 +260,9 @@ public class HiveInputFormat<K extends W
 
     Utilities.copyTableJobPropertiesToConf(table, conf);
 
-    pushFilters(conf, tableScan);
+    if (tableScan != null) {
+      pushFilters(conf, tableScan);
+    }
 
     FileInputFormat.setInputPaths(conf, dirs.toArray(new Path[dirs.size()]));
     conf.setInputFormat(inputFormat.getClass());
@@ -300,7 +302,7 @@ public class HiveInputFormat<K extends W
       // Make filter pushdown information available to getSplits.
       if ((aliases != null) && (aliases.size() == 1)) {
         Operator op = mrwork.getAliasToWork().get(aliases.get(0));
-        if ((op != null) && (op instanceof TableScanOperator)) {
+        if (op instanceof TableScanOperator) {
           tableScan = (TableScanOperator) op;
         }
       }