This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/IAnalysis in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b9a5c75f9f5b3998efa33e428f461c9f7edf253e Author: Beyyes <[email protected]> AuthorDate: Tue Jun 11 13:13:55 2024 +0800 perfect methods of IAnalysis to adapt table model write process --- .../iotdb/db/queryengine/plan/analyze/Analysis.java | 11 +++++++++++ .../iotdb/db/queryengine/plan/analyze/IAnalysis.java | 16 ++++++++++++++++ .../distribution/WriteFragmentParallelPlanner.java | 8 +++----- .../plan/planner/plan/node/WritePlanNode.java | 4 ++-- .../planner/plan/node/load/LoadSingleTsFileNode.java | 4 ++-- .../plan/planner/plan/node/load/LoadTsFileNode.java | 9 +++++---- .../plan/planner/plan/node/load/LoadTsFilePieceNode.java | 4 ++-- .../plan/node/metedata/write/ActivateTemplateNode.java | 4 ++-- .../plan/node/metedata/write/AlterTimeSeriesNode.java | 4 ++-- .../node/metedata/write/BatchActivateTemplateNode.java | 4 ++-- .../node/metedata/write/CreateAlignedTimeSeriesNode.java | 4 ++-- .../node/metedata/write/CreateMultiTimeSeriesNode.java | 4 ++-- .../plan/node/metedata/write/CreateTimeSeriesNode.java | 4 ++-- .../write/InternalBatchActivateTemplateNode.java | 4 ++-- .../write/InternalCreateMultiTimeSeriesNode.java | 4 ++-- .../metedata/write/InternalCreateTimeSeriesNode.java | 4 ++-- .../node/metedata/write/view/CreateLogicalViewNode.java | 4 ++-- .../plan/node/pipe/PipeEnrichedDeleteDataNode.java | 4 ++-- .../planner/plan/node/pipe/PipeEnrichedInsertNode.java | 4 ++-- .../plan/node/pipe/PipeEnrichedWritePlanNode.java | 4 ++-- .../plan/planner/plan/node/write/DeleteDataNode.java | 5 +++-- .../planner/plan/node/write/InsertMultiTabletsNode.java | 4 ++-- .../plan/planner/plan/node/write/InsertRowNode.java | 4 ++-- .../plan/planner/plan/node/write/InsertRowsNode.java | 4 ++-- .../plan/node/write/InsertRowsOfOneDeviceNode.java | 4 ++-- .../plan/planner/plan/node/write/InsertTabletNode.java | 4 ++-- 26 files changed, 80 insertions(+), 53 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index 5897f78b0dd..2aeec556fac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -39,6 +39,8 @@ import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySour import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; +import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; @@ -375,6 +377,7 @@ public class Analysis implements IAnalysis { this.statement = statement; } + @Override public DataPartition getDataPartitionInfo() { return dataPartition; } @@ -383,6 +386,7 @@ public class Analysis implements IAnalysis { this.dataPartition = dataPartition; } + @Override public SchemaPartition getSchemaPartitionInfo() { return schemaPartition; } @@ -403,10 +407,12 @@ public class Analysis implements IAnalysis { return redirectNodeList; } + @Override public void setRedirectNodeList(List<TEndPoint> redirectNodeList) { this.redirectNodeList = redirectNodeList; } + @Override public void addEndPointToRedirectNodeList(TEndPoint endPoint) { if (redirectNodeList == null) { redirectNodeList = new ArrayList<>(); @@ -422,6 +428,11 @@ public class Analysis implements IAnalysis { this.globalTimePredicate = timeFilter; } + @Override + public TimePredicate getCovertedTimePredicate() { + return globalTimePredicate == null ? null : new TreeModelTimePredicate(globalTimePredicate); + } + @Override public DatasetHeader getRespDatasetHeader() { return respDatasetHeader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/IAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/IAnalysis.java index 207dea7b9f3..4adcd7e298c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/IAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/IAnalysis.java @@ -19,12 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; +import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.tsfile.read.common.block.TsBlock; +import java.util.List; + public interface IAnalysis { boolean isFailed(); @@ -42,4 +48,14 @@ public interface IAnalysis { DatasetHeader getRespDatasetHeader(); String getStatementType(); + + SchemaPartition getSchemaPartitionInfo(); + + DataPartition getDataPartitionInfo(); + + void setRedirectNodeList(List<TEndPoint> redirectNodeList); + + void addEndPointToRedirectNodeList(TEndPoint endPoint); + + TimePredicate getCovertedTimePredicate(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java index 6fb32419a4b..9bc526ee4f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java @@ -22,12 +22,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.commons.partition.StorageExecutor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.IFragmentParallelPlaner; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; @@ -37,7 +36,7 @@ import java.util.List; public class WriteFragmentParallelPlanner implements IFragmentParallelPlaner { private SubPlan subPlan; - private Analysis analysis; + private IAnalysis analysis; private MPPQueryContext queryContext; public WriteFragmentParallelPlanner( @@ -50,7 +49,6 @@ public class WriteFragmentParallelPlanner implements IFragmentParallelPlaner { @Override public List<FragmentInstance> parallelPlan() { PlanFragment fragment = subPlan.getPlanFragment(); - Expression globalTimePredicate = analysis.getGlobalTimePredicate(); PlanNode node = fragment.getPlanNodeTree(); if (!(node instanceof WritePlanNode)) { throw new IllegalArgumentException("PlanNode should be IWritePlanNode in WRITE operation"); @@ -62,7 +60,7 @@ public class WriteFragmentParallelPlanner implements IFragmentParallelPlaner { new FragmentInstance( new PlanFragment(fragment.getId(), split), fragment.getId().genFragmentInstanceId(), - globalTimePredicate == null ? null : new TreeModelTimePredicate(globalTimePredicate), + analysis.getCovertedTimePredicate(), queryContext.getQueryType(), queryContext.getTimeOut(), queryContext.getSession()); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index 98a98e0ca19..43cbb20a40a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import java.util.List; @@ -29,5 +29,5 @@ public abstract class WritePlanNode extends PlanNode implements IPartitionRelate super(id); } - public abstract List<WritePlanNode> splitByPartition(Analysis analysis); + public abstract List<WritePlanNode> splitByPartition(IAnalysis analysis); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java index 85bf2612510..3623e976007 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -25,7 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.WritePlanNode; @@ -188,7 +188,7 @@ public class LoadSingleTsFileNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { throw new NotImplementedException("split load single TsFile is not implemented"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java index 74df1b08dbd..540f9e4d9f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.WritePlanNode; @@ -88,13 +89,13 @@ public class LoadTsFileNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { List<WritePlanNode> res = new ArrayList<>(); LoadTsFileStatement statement = - analysis.getStatement() instanceof PipeEnrichedStatement + ((Analysis) analysis).getStatement() instanceof PipeEnrichedStatement ? (LoadTsFileStatement) - ((PipeEnrichedStatement) analysis.getStatement()).getInnerStatement() - : (LoadTsFileStatement) analysis.getStatement(); + ((PipeEnrichedStatement) ((Analysis) analysis).getStatement()).getInnerStatement() + : (LoadTsFileStatement) ((Analysis) analysis).getStatement(); for (int i = 0; i < resources.size(); i++) { res.add( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index 1f4e6e08a3d..c3c4c3fa2e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.queryengine.execution.load.TsFileData; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -147,7 +147,7 @@ public class LoadTsFilePieceNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { throw new NotImplementedException("split load piece TsFile is not implemented"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/ActivateTemplateNode.java index a8258a6ee01..8749b93aca1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/ActivateTemplateNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -161,7 +161,7 @@ public class ActivateTemplateNode extends WritePlanNode implements IActivateTemp } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TRegionReplicaSet regionReplicaSet = analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(activatePath.getFullPath()); setRegionReplicaSet(regionReplicaSet); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java index 1eb84813cad..e567441c9c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -373,7 +373,7 @@ public class AlterTimeSeriesNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TRegionReplicaSet regionReplicaSet = analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getDevice()); setRegionReplicaSet(regionReplicaSet); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/BatchActivateTemplateNode.java index 8b71889d396..bc0767e4c5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/BatchActivateTemplateNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -148,7 +148,7 @@ public class BatchActivateTemplateNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { // gather devices to same target region Map<TRegionReplicaSet, Map<PartialPath, Pair<Integer, Integer>>> splitMap = new HashMap<>(); for (Map.Entry<PartialPath, Pair<Integer, Integer>> entry : templateActivationMap.entrySet()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java index 600fab6b9a7..64e70aad1bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateAlignedTimeSeriesNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -455,7 +455,7 @@ public class CreateAlignedTimeSeriesNode extends WritePlanNode } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TRegionReplicaSet regionReplicaSet = analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(devicePath.getFullPath()); setRegionReplicaSet(regionReplicaSet); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java index 8fe92fc946f..94d3e407fb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -229,7 +229,7 @@ public class CreateMultiTimeSeriesNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { // gather devices to same target region Map<TRegionReplicaSet, Map<PartialPath, MeasurementGroup>> splitMap = new HashMap<>(); for (Map.Entry<PartialPath, MeasurementGroup> entry : measurementGroupMap.entrySet()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java index 66ab5d49608..c089a5218c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -386,7 +386,7 @@ public class CreateTimeSeriesNode extends WritePlanNode implements ICreateTimeSe } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TRegionReplicaSet regionReplicaSet = analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getDevice()); setRegionReplicaSet(regionReplicaSet); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalBatchActivateTemplateNode.java index 6d78d879134..66797b99939 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalBatchActivateTemplateNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -141,7 +141,7 @@ public class InternalBatchActivateTemplateNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { // gather devices to same target region Map<TRegionReplicaSet, Map<PartialPath, Pair<Integer, Integer>>> splitMap = new HashMap<>(); for (Map.Entry<PartialPath, Pair<Integer, Integer>> entry : templateActivationMap.entrySet()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateMultiTimeSeriesNode.java index b6e71de471f..a15f8f92f14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateMultiTimeSeriesNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -143,7 +143,7 @@ public class InternalCreateMultiTimeSeriesNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { // gather devices to same target region Map<TRegionReplicaSet, Map<PartialPath, Pair<Boolean, MeasurementGroup>>> splitMap = new HashMap<>(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateTimeSeriesNode.java index 99b11e6f501..6caeb10a9e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/InternalCreateTimeSeriesNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -136,7 +136,7 @@ public class InternalCreateTimeSeriesNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TRegionReplicaSet regionReplicaSet = analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(devicePath.getFullPath()); setRegionReplicaSet(regionReplicaSet); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java index a2d80227beb..25ba8ec288b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -220,7 +220,7 @@ public class CreateLogicalViewNode extends WritePlanNode implements ICreateLogic } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { Map<TRegionReplicaSet, Map<PartialPath, ViewExpression>> splitMap = new HashMap<>(); for (Map.Entry<PartialPath, ViewExpression> entry : this.viewPathToSourceMap.entrySet()) { // for each entry in the map for target path to source expression, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index 4b5be108fb2..57450a3cd06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -162,7 +162,7 @@ public class PipeEnrichedDeleteDataNode extends DeleteDataNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { return deleteDataNode.splitByPartition(analysis).stream() .map( plan -> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index 596e771b21a..855fe79de5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -134,7 +134,7 @@ public class PipeEnrichedInsertNode extends InsertNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { return insertNode.splitByPartition(analysis).stream() .map( plan -> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index b83ac39b4b3..2e7f7eeb4ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -184,7 +184,7 @@ public class PipeEnrichedWritePlanNode extends WritePlanNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { return writePlanNode.splitByPartition(analysis).stream() .map( plan -> diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index 877187be5a6..93eb2a873ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; @@ -281,8 +282,8 @@ public class DeleteDataNode extends WritePlanNode implements WALEntryValue { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { - ISchemaTree schemaTree = analysis.getSchemaTree(); + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { + ISchemaTree schemaTree = ((Analysis) analysis).getSchemaTree(); DataPartition dataPartition = analysis.getDataPartitionInfo(); Map<TRegionReplicaSet, List<PartialPath>> regionToPatternMap = new HashMap<>(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index 683d6607ace..430ab19c7c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.utils.StatusUtils; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -135,7 +135,7 @@ public class InsertMultiTabletsNode extends InsertNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { Map<TRegionReplicaSet, InsertMultiTabletsNode> splitMap = new HashMap<>(); for (int i = 0; i < insertTabletNodeList.size(); i++) { InsertTabletNode insertTabletNode = insertTabletNodeList.get(i); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index d961f0d869c..bda7132fb7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; @@ -107,7 +107,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartitionSlot(time); this.dataRegionReplicaSet = analysis diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 215f38bb11f..49fb7fac631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -25,7 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -232,7 +232,7 @@ public class InsertRowsNode extends InsertNode implements WALEntryValue { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { Map<TRegionReplicaSet, InsertRowsNode> splitMap = new HashMap<>(); List<TEndPoint> redirectInfo = new ArrayList<>(); for (int i = 0; i < insertRowNodeList.size(); i++) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index 6fd53ce6da2..864880fd774 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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.PlanNodeType; @@ -154,7 +154,7 @@ public class InsertRowsOfOneDeviceNode extends InsertNode { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { List<WritePlanNode> result = new ArrayList<>(); Map<TRegionReplicaSet, Map<TTimePartitionSlot, List<InsertRowNode>>> splitMap = new HashMap<>(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index ed37df61e3f..6fc61399b35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; @@ -192,7 +192,7 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue { } @Override - public List<WritePlanNode> splitByPartition(Analysis analysis) { + public List<WritePlanNode> splitByPartition(IAnalysis analysis) { // only single device in single database List<WritePlanNode> result = new ArrayList<>(); if (times.length == 0) {
