This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 690a519742 [fix](Nereids) disable or expansion when pipeline engine is
disable (#22719)
690a519742 is described below
commit 690a51974277237064e647f8b68cd7fe59f3e4c9
Author: 谢健 <[email protected]>
AuthorDate: Wed Aug 9 14:33:50 2023 +0800
[fix](Nereids) disable or expansion when pipeline engine is disable (#22719)
---
.../java/org/apache/doris/nereids/rules/exploration/OrExpansion.java | 4 +++-
regression-test/suites/nereids_p0/union/or_expansion.groovy | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java
index 55bc3840d2..af46ee2d75 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/OrExpansion.java
@@ -35,6 +35,7 @@ import
org.apache.doris.nereids.trees.plans.logical.LogicalProject;
import org.apache.doris.nereids.trees.plans.logical.LogicalUnion;
import org.apache.doris.nereids.util.ExpressionUtils;
import org.apache.doris.nereids.util.JoinUtils;
+import org.apache.doris.qe.ConnectContext;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
@@ -59,7 +60,8 @@ public class OrExpansion extends OneExplorationRuleFactory {
public Rule build() {
return logicalJoin()
.when(JoinUtils::shouldNestedLoopJoin)
- .when(join -> join.getJoinType().isInnerJoin())
+ .when(join -> join.getJoinType().isInnerJoin()
+ &&
ConnectContext.get().getSessionVariable().getEnablePipelineEngine())
.thenApply(ctx -> {
LogicalJoin<? extends Plan, ? extends Plan> join =
ctx.root;
Preconditions.checkArgument(join.getHashJoinConjuncts().isEmpty(),
diff --git a/regression-test/suites/nereids_p0/union/or_expansion.groovy
b/regression-test/suites/nereids_p0/union/or_expansion.groovy
index bd97208886..cf05567834 100644
--- a/regression-test/suites/nereids_p0/union/or_expansion.groovy
+++ b/regression-test/suites/nereids_p0/union/or_expansion.groovy
@@ -18,6 +18,7 @@
suite("or_expansion") {
sql "SET enable_nereids_planner=true"
sql "SET enable_fallback_to_original_planner=false"
+ sql "SET enable_pipeline_engine = true"
def db = "nereids_test_query_db"
sql "use ${db}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
