[fix](Nereids) disable or expansion when pipeline engine is disable (#…

…22719)
apache · Aug 11, 2023 · 314755f · 314755f
1 parent 8fdd91b
commit 314755f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -35,6 +35,7 @@
 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
@@ -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}"