[fix](Nereids) explain should fallback too if Nereids is not enable (#…

…28475) pick from master PR #28475 commit b50bc0d
apache · Dec 20, 2023 · 536b666 · 536b666
1 parent 8f175f9
commit 536b666
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 13 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/DeleteCommand.java
@@ -130,6 +130,14 @@ public LogicalPlan getLogicalQuery() {
 
     @Override
     public Plan getExplainPlan(ConnectContext ctx) {
+        if (!ctx.getSessionVariable().isEnableNereidsDML()) {
+            try {
+                ctx.getSessionVariable().enableFallbackToOriginalPlannerOnce();
+            } catch (Exception e) {
+                throw new AnalysisException("failed to set fallback to original planner to true", e);
+            }
+            throw new AnalysisException("Nereids DML is disabled, will try to fall back to the original planner");
+        }
         return completeQueryPlan(ctx, logicalQuery);
     }
 

diff --git a/...e/src/main/java/org/apache/doris/nereids/trees/plans/commands/InsertIntoTableCommand.java b/...e/src/main/java/org/apache/doris/nereids/trees/plans/commands/InsertIntoTableCommand.java
@@ -160,6 +160,14 @@ public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
 
     @Override
     public Plan getExplainPlan(ConnectContext ctx) {
+        if (!ctx.getSessionVariable().isEnableNereidsDML()) {
+            try {
+                ctx.getSessionVariable().enableFallbackToOriginalPlannerOnce();
+            } catch (Exception e) {
+                throw new AnalysisException("failed to set fallback to original planner to true", e);
+            }
+            throw new AnalysisException("Nereids DML is disabled, will try to fall back to the original planner");
+        }
         return this.logicalQuery;
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UpdateCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/UpdateCommand.java
@@ -148,6 +148,14 @@ private void checkTable(ConnectContext ctx) throws AnalysisException {
 
     @Override
     public Plan getExplainPlan(ConnectContext ctx) throws AnalysisException {
+        if (!ctx.getSessionVariable().isEnableNereidsDML()) {
+            try {
+                ctx.getSessionVariable().enableFallbackToOriginalPlannerOnce();
+            } catch (Exception e) {
+                throw new AnalysisException("failed to set fallback to original planner to true", e);
+            }
+            throw new AnalysisException("Nereids DML is disabled, will try to fall back to the original planner");
+        }
         return completeQueryPlan(ctx, logicalQuery);
     }
 

diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/util/ReadLockTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/util/ReadLockTest.java
@@ -108,20 +108,26 @@ public void testScalarSubQuery() {
     }
 
     @Test
-    public void testInserInto() {
+    public void testInsertInto() {
         String sql = "INSERT INTO supplier(s_suppkey) SELECT lo_orderkey FROM lineorder";
         StatementContext statementContext = MemoTestUtils.createStatementContext(connectContext, sql);
-        InsertIntoTableCommand insertIntoTableCommand = (InsertIntoTableCommand) parser.parseSingle(sql);
-        NereidsPlanner planner = new NereidsPlanner(statementContext);
-        planner.plan(
-                (LogicalPlan) insertIntoTableCommand.getExplainPlan(connectContext),
-                PhysicalProperties.ANY
-        );
-        CascadesContext cascadesContext = planner.getCascadesContext();
-        List<TableIf> f = cascadesContext.getTables();
-        Assertions.assertEquals(2, f.size());
-        Set<String> tableNames = f.stream().map(TableIf::getName).collect(Collectors.toSet());
-        Assertions.assertTrue(tableNames.contains("supplier"));
-        Assertions.assertTrue(tableNames.contains("lineorder"));
+        boolean originalDML = connectContext.getSessionVariable().enableNereidsDML;
+        connectContext.getSessionVariable().enableNereidsDML = true;
+        try {
+            InsertIntoTableCommand insertIntoTableCommand = (InsertIntoTableCommand) parser.parseSingle(sql);
+            NereidsPlanner planner = new NereidsPlanner(statementContext);
+            planner.plan(
+                    (LogicalPlan) insertIntoTableCommand.getExplainPlan(connectContext),
+                    PhysicalProperties.ANY
+            );
+            CascadesContext cascadesContext = planner.getCascadesContext();
+            List<TableIf> f = cascadesContext.getTables();
+            Assertions.assertEquals(2, f.size());
+            Set<String> tableNames = f.stream().map(TableIf::getName).collect(Collectors.toSet());
+            Assertions.assertTrue(tableNames.contains("supplier"));
+            Assertions.assertTrue(tableNames.contains("lineorder"));
+        } finally {
+            connectContext.getSessionVariable().enableNereidsDML = originalDML;
+        }
     }
 }