### Eclipse Workspace Patch 1.0 #P hive-TRUNK Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java (revision 1628371) +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java (working copy) @@ -324,6 +324,11 @@ } MapJoinOperator mapJoinOp = convertJoinMapJoin(joinOp, context, bigTablePosition); + if (mapJoinOp == null) { + LOG.info("Conversion to map join failed."); + return false; + } + MapJoinDesc joinDesc = mapJoinOp.getConf(); joinDesc.setBucketMapJoin(true);