This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 7154fdfd1a7 [fix](Nereids): OuterJoinAssoc reject literal condition
(#31172) (#31291)
7154fdfd1a7 is described below
commit 7154fdfd1a7b8eca0e3fb50f387e537336c118f4
Author: jakevin <jakevin...@gmail.com>
AuthorDate: Thu Feb 22 20:31:41 2024 +0800
[fix](Nereids): OuterJoinAssoc reject literal condition (#31172) (#31291)
(cherry picked from commit e0e3c3873d15de9a92840af9629c094381824588)
---
.../org/apache/doris/nereids/rules/exploration/join/OuterJoinAssoc.java | 2 +-
.../doris/nereids/rules/exploration/join/OuterJoinAssocProject.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssoc.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssoc.java
index 2080cfce93d..3208654fa78 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssoc.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssoc.java
@@ -79,7 +79,7 @@ public class OuterJoinAssoc extends OneExplorationRuleFactory
{
.addAll(topJoin.getOtherJoinConjuncts()).build();
Set<Slot> notNullSlots =
ExpressionUtils.inferNotNullSlots(on,
ctx.cascadesContext);
- if (!conditionSlot.equals(notNullSlots)) {
+ if (conditionSlot.isEmpty() ||
!conditionSlot.equals(notNullSlots)) {
return null;
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssocProject.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssocProject.java
index cbbd72b5c87..96dadc2135d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssocProject.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/join/OuterJoinAssocProject.java
@@ -80,7 +80,7 @@ public class OuterJoinAssocProject extends
OneExplorationRuleFactory {
.addAll(topJoin.getOtherJoinConjuncts()).build();
Set<Slot> notNullSlots =
ExpressionUtils.inferNotNullSlots(on,
ctx.cascadesContext);
- if (!conditionSlot.equals(notNullSlots)) {
+ if (conditionSlot.isEmpty() ||
!conditionSlot.equals(notNullSlots)) {
return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
