fix ut test

apache · Jun 7, 2024 · 28fa036 · 28fa036
1 parent e5b0840
commit 28fa036
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -3885,6 +3885,10 @@ public boolean isEnableMaterializedViewRewrite() {
         return enableMaterializedViewRewrite;
     }
 
+    public void setEnableMaterializedViewRewrite(boolean enableMaterializedViewRewrite) {
+        this.enableMaterializedViewRewrite = enableMaterializedViewRewrite;
+    }
+
     public boolean isMaterializedViewRewriteEnableContainExternalTable() {
         return materializedViewRewriteEnableContainExternalTable;
     }

diff --git a/...rc/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/CompareOuterJoinTest.java b/...rc/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/CompareOuterJoinTest.java
@@ -68,6 +68,7 @@ void testStarGraphWithInnerJoin() {
     @Test
     void testRandomQuery() {
         connectContext.getSessionVariable().setDisableNereidsRules("PRUNE_EMPTY_PARTITION");
+        connectContext.getSessionVariable().setEnableMaterializedViewRewrite(false);
         Plan p1 = new HyperGraphBuilder(Sets.newHashSet(JoinType.INNER_JOIN))
                 .randomBuildPlanWith(3, 3);
         PlanChecker planChecker = PlanChecker.from(connectContext, p1)

diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SimplifyAggGroupByTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/SimplifyAggGroupByTest.java
@@ -32,6 +32,7 @@
 import org.apache.doris.nereids.util.MemoTestUtils;
 import org.apache.doris.nereids.util.PlanChecker;
 import org.apache.doris.nereids.util.PlanConstructor;
+import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Test;
@@ -60,12 +61,14 @@ void test() {
         LogicalPlan agg = new LogicalPlanBuilder(scan1)
                 .agg(groupBy, output)
                 .build();
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        ConnectContext connectContext = MemoTestUtils.createConnectContext();
+        connectContext.getSessionVariable().setEnableMaterializedViewRewrite(false);
+        PlanChecker.from(connectContext, agg)
                 .applyTopDown(new SimplifyAggGroupBy())
                 .matchesFromRoot(
                         logicalAggregate().when(a -> a.getGroupByExpressions().size() == 1)
                 );
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        PlanChecker.from(connectContext, agg)
                 .analyze()
                 .matchesFromRoot(
                         logicalProject(logicalAggregate().when(a -> a.getGroupByExpressions().size() == 1))
@@ -87,12 +90,14 @@ void testSqrt() {
         LogicalPlan agg = new LogicalPlanBuilder(scan1)
                 .agg(groupBy, output)
                 .build();
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        ConnectContext connectContext = MemoTestUtils.createConnectContext();
+        connectContext.getSessionVariable().setEnableMaterializedViewRewrite(false);
+        PlanChecker.from(connectContext, agg)
                 .applyTopDown(new SimplifyAggGroupBy())
                 .matchesFromRoot(
                         logicalAggregate().when(a -> a.equals(agg))
                 );
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        PlanChecker.from(connectContext, agg)
                 .analyze()
                 .matchesFromRoot(
                         logicalProject(logicalAggregate().when(a -> a.getGroupByExpressions().size() == 2))
@@ -114,12 +119,14 @@ void testAbs() {
         LogicalPlan agg = new LogicalPlanBuilder(scan1)
                 .agg(groupBy, output)
                 .build();
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        ConnectContext connectContext = MemoTestUtils.createConnectContext();
+        connectContext.getSessionVariable().setEnableMaterializedViewRewrite(false);
+        PlanChecker.from(connectContext, agg)
                 .applyTopDown(new SimplifyAggGroupBy())
                 .matchesFromRoot(
                         logicalAggregate().when(a -> a.equals(agg))
                 );
-        PlanChecker.from(MemoTestUtils.createConnectContext(), agg)
+        PlanChecker.from(connectContext, agg)
                 .analyze()
                 .matchesFromRoot(
                         logicalProject(logicalAggregate().when(a -> a.getGroupByExpressions().size() == 2))