DRILL-2967: Incompatible types error reported in a "not in" query with compatible data types

1 files changed, 6 insertions, 1 deletions

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
index ee2ce7fdc..2e777f66b 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
@@ -378,8 +378,12 @@ public class MergeJoinBatch extends AbstractRecordBatch<MergeJoinPOP> {
       leftExpr[i] =  materializeExpression(condition.getLeft(), lastLeftStatus, left, collector);
       rightExpr[i] = materializeExpression(condition.getRight(), lastRightStatus, right, collector);
     }
-    JoinUtils.addLeastRestrictiveCasts(leftExpr, left, rightExpr, right, context);
 
+    // if right side is empty, rightExpr will most likely default to NULLABLE INT which may cause the following
+    // call to throw an exception. In this case we can safely skip adding the casts
+    if (lastRightStatus != IterOutcome.NONE) {
+      JoinUtils.addLeastRestrictiveCasts(leftExpr, left, rightExpr, right, context);
+    }
     //generate doCompare() method
     /////////////////////////////////////////
     generateDoCompare(cg, incomingRecordBatch, leftExpr, incomingLeftRecordBatch, rightExpr,
@@ -561,4 +565,5 @@ public class MergeJoinBatch extends AbstractRecordBatch<MergeJoinPOP> {
     }
     return materializedExpr;
   }
+
 }