This is an automated email from the ASF dual-hosted git repository. ycycse pushed a commit to branch ycy/supportEA in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dd0029eb3e14fe47533d08314e83bed62f9e3917 Author: ycycse <[email protected]> AuthorDate: Sun Nov 24 00:36:51 2024 +0800 spotless --- .../plan/planner/TableOperatorGenerator.java | 24 ++++++++++------------ .../relational/planner/TableLogicalPlanner.java | 9 ++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java index 64a98c10111..cb682fa53ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java @@ -35,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ShuffleSinkHandle; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.CollectOperator; @@ -84,7 +83,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggr import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -1804,17 +1802,17 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution @Override public Operator visitExplainAnalyze(ExplainAnalyzeNode node, LocalExecutionPlanContext context) { - Operator operator = node.getChild().accept(this, context); - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - ExplainAnalyzeOperator.class.getSimpleName()); - return new ExplainAnalyzeOperator( - operatorContext, operator, node.getQueryId(), node.isVerbose(), node.getTimeout()); - } + Operator operator = node.getChild().accept(this, context); + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + ExplainAnalyzeOperator.class.getSimpleName()); + return new ExplainAnalyzeOperator( + operatorContext, operator, node.getQueryId(), node.isVerbose(), node.getTimeout()); + } private boolean[] checkStatisticAndScanOrder( AggregationTableScanNode node, String timeColumnName) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java index 8ef7b4a4407..31b8831b737 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java @@ -65,11 +65,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.LongType; import org.apache.tsfile.read.common.type.TypeFactory; -import org.apache.tsfile.enums.TSDataType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; @@ -450,7 +448,10 @@ public class TableLogicalPlanner { queryContext.getLocalQueryId(), queryContext.getTimeOut()); return new RelationPlan( - newRoot, originalQueryPlan.getScope(), originalQueryPlan.getFieldMappings()); + newRoot, + originalQueryPlan.getScope(), + originalQueryPlan.getFieldMappings(), + Optional.empty()); } private enum Stage {
