Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion core/src/main/java/org/apache/calcite/tools/RelBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
import org.apache.calcite.rex.RexShuttle;
import org.apache.calcite.rex.RexSimplify;
import org.apache.calcite.rex.RexSubQuery;
import org.apache.calcite.rex.RexUnknownAs;
import org.apache.calcite.rex.RexUtil;
import org.apache.calcite.rex.RexWindowBound;
import org.apache.calcite.rex.RexWindowBounds;
Expand Down Expand Up @@ -3315,7 +3316,12 @@ public RelBuilder join(JoinRelType joinType, RexNode condition,
RelOptUtil.collapseExpandedIsNotDistinctFromExpr((RexCall) condition,
getRexBuilder());
}
condition = simplifier.simplifyUnknownAsFalse(condition);

condition =
simplifier.simplifyUnknownAs(condition,
joinType == JoinRelType.LEFT_MARK
? RexUnknownAs.UNKNOWN
: RexUnknownAs.FALSE);
}
if (correlate) {
final CorrelationId id = Iterables.getOnlyElement(variablesSet);
Expand Down
17 changes: 17 additions & 0 deletions core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -12177,6 +12177,23 @@ private void checkLoptOptimizeJoinRule(LoptOptimizeJoinRule rule) {
.checkUnchanged();
}

/** Test case of
* <a href="https://issues.apache.org/jira/browse/CALCITE-7397">[CALCITE-7397]
* Error in simplifying join condition when creating LEFT MARK JOIN</a>. */
@Test void testMarkJoinMarkerColumnTypeNullableMismatch() {
final String sql = "select sal,\n"
+ " cast(null as int) IN (\n"
+ " select cast(null as int)\n"
+ " from dept)\n"
+ "from emp";

sql(sql)
.withRule(CoreRules.PROJECT_SUB_QUERY_TO_MARK_CORRELATE)
.withLateDecorrelate(true)
.withTopDownGeneralDecorrelate(true)
.check();
}

/** Test case of
* <a href="https://issues.apache.org/jira/browse/CALCITE-7369">[CALCITE-7369]
* ProjectToWindowRule loses column alias when optimizing OVER window queries</a>. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9705,6 +9705,42 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($7, $9)]], projFields=[[{0, 1, 2, 3, 4, 5, 6, 7, 8}, {0, 1}]], postJoinFilter=[AND(LIKE($1, 'bar'), >($9, 3))])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
]]>
</Resource>
</TestCase>
<TestCase name="testMarkJoinMarkerColumnTypeNullableMismatch">
<Resource name="sql">
<![CDATA[select sal,
cast(null as int) IN (
select cast(null as int)
from dept)
from emp]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
LogicalProject(SAL=[$5], EXPR$1=[IN(null:INTEGER, {
LogicalProject(EXPR$0=[null:INTEGER])
LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
})])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
]]>
</Resource>
<Resource name="planMid">
<![CDATA[
LogicalProject(SAL=[$5], EXPR$1=[$9])
LogicalJoin(condition=[null:BOOLEAN], joinType=[left_mark])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
LogicalProject(EXPR$0=[null:INTEGER])
LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
]]>
</Resource>
<Resource name="planAfter">
<![CDATA[
LogicalProject(SAL=[$5], EXPR$1=[$9])
LogicalJoin(condition=[null:BOOLEAN], joinType=[left_mark])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
LogicalProject(EXPR$0=[null:INTEGER])
LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
]]>
</Resource>
</TestCase>
Expand Down
Loading