Various fixes

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRelFactories.java

@@ -27,7 +27,9 @@
 import org.apache.calcite.rel.core.RelFactories;
 import org.apache.calcite.rel.hint.RelHint;
 import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rex.RexInputRef;
 import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.rex.RexShuttle;
 import org.apache.calcite.rex.RexUtil;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.tools.RelBuilderFactory;
@@ -136,7 +138,25 @@ public RelNode createProject(RelNode input, List<RelHint> hints, List<? extends
   private static class DrillFilterFactoryImpl implements RelFactories.FilterFactory {
     @Override
     public RelNode createFilter(RelNode child, RexNode condition, Set<CorrelationId> variablesSet) {
-      return DrillFilterRel.create(child, condition);
+      // Normalize nullability of RexInputRef nodes to match the input's row type
+      // This is necessary for Calcite 1.37+ which has stricter type checking
+      RexNode normalizedCondition = condition.accept(new RexShuttle() {
+        @Override
+        public RexNode visitInputRef(RexInputRef inputRef) {
+          int index = inputRef.getIndex();
+          if (index >= child.getRowType().getFieldCount()) {
+            return inputRef;
+          }
+          RelDataType actualType = child.getRowType().getFieldList().get(index).getType();
+          // If nullability differs, create a new RexInputRef with correct nullability
+          if (inputRef.getType().isNullable() != actualType.isNullable() ||
+              !inputRef.getType().equals(actualType)) {
+            return new RexInputRef(index, actualType);
+          }
+          return inputRef;
+        }
+      });
+      return DrillFilterRel.create(child, normalizedCondition);
     }
   }
 

exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java

@@ -423,9 +423,10 @@ public void testPartitionFilterWithLike() throws Exception {
   public void testPartitionFilterWithInSubquery() throws Exception {
     String query = "select * from dfs.`multilevel/parquet` where cast (dir0 as int) IN (1994, 1994, 1994, 1994, 1994, 1994)";
     try {
-      /* In list size exceeds threshold - no partition pruning since predicate converted to join */
+      /* In list size exceeds threshold - partition pruning still works in Calcite 1.37+
+       * due to JoinPushTransitivePredicatesRule pushing predicates through semi-joins */
       client.alterSession(PlannerSettings.IN_SUBQUERY_THRESHOLD.getOptionName(), 2);
-      testExcludeFilter(query, 12, "Filter\\(", 40);
+      testExcludeFilter(query, 4, "Filter\\(", 40);
       /* In list size does not exceed threshold - partition pruning */
       client.alterSession(PlannerSettings.IN_SUBQUERY_THRESHOLD.getOptionName(), 10);
       testExcludeFilter(query, 4, "Filter\\(", 40);