From e0834b2f462fb5f6ec4130c5e5e30438cc9a096b Mon Sep 17 00:00:00 2001 From: zclllyybb Date: Fri, 15 Sep 2023 10:17:17 +0800 Subject: [PATCH] [chore](explain) add annotation in explain string whether nereids is ON #24394 --- .../trees/plans/commands/ExplainCommand.java | 2 +- .../java/org/apache/doris/qe/StmtExecutor.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExplainCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExplainCommand.java index 9e02b8b4e9..58e05855c0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExplainCommand.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExplainCommand.java @@ -80,7 +80,7 @@ public class ExplainCommand extends Command implements NoForward { planner.plan(logicalPlanAdapter, ctx.getSessionVariable().toThrift()); executor.setPlanner(planner); executor.checkBlockRules(); - executor.handleExplainStmt(planner.getExplainString(new ExplainOptions(level))); + executor.handleExplainStmt(planner.getExplainString(new ExplainOptions(level)), true); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java index 5100e2d436..0f7ff23972 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -1337,7 +1337,7 @@ public class StmtExecutor { if (queryStmt.isExplain()) { String explainString = planner.getExplainString(queryStmt.getExplainOptions()); - handleExplainStmt(explainString); + handleExplainStmt(explainString, false); return; } @@ -1737,7 +1737,7 @@ public class StmtExecutor { ExplainOptions explainOptions = insertStmt.getQueryStmt().getExplainOptions(); insertStmt.setIsExplain(explainOptions); String explainString = planner.getExplainString(explainOptions); - handleExplainStmt(explainString); + handleExplainStmt(explainString, false); return; } @@ -2198,11 +2198,11 @@ public class StmtExecutor { private void handleLockTablesStmt() { } - public void handleExplainStmt(String result) throws IOException { - ShowResultSetMetaData metaData = - ShowResultSetMetaData.builder() - .addColumn(new Column("Explain String", ScalarType.createVarchar(20))) - .build(); + public void handleExplainStmt(String result, boolean isNereids) throws IOException { + ShowResultSetMetaData metaData = ShowResultSetMetaData.builder() + .addColumn(new Column("Explain String" + (isNereids ? "(Nereids Planner)" : "(Old Planner)"), + ScalarType.createVarchar(20))) + .build(); sendMetaData(metaData); // Send result set.