Index: ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (revision 1535630) +++ ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java (working copy) @@ -260,7 +260,9 @@ 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 @@ // 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; } }