This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch move-pipeline-memory-estimator in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a32523651a83c175d4b2bcb29982456d16f44fdc Author: shuwenwei <[email protected]> AuthorDate: Tue Aug 25 17:13:59 2026 +0800 Move PipelineMemoryEstimator to calc-commons Move the pipeline memory estimator base class from datanode to calc-commons so that it can be shared across modules, and update the referencing imports accordingly. --- .../iotdb/calc}/plan/planner/memory/PipelineMemoryEstimator.java | 4 ++-- .../iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java | 2 +- .../iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java | 2 +- .../iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java | 2 +- .../planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java | 1 + .../memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java | 1 + .../plan/planner/memory/PipelineMemoryEstimatorFactory.java | 1 + .../apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java | 2 +- 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/PipelineMemoryEstimator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/PipelineMemoryEstimator.java index 181826877d3..7e23fb574bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/PipelineMemoryEstimator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.memory; +package org.apache.iotdb.calc.plan.planner.memory; import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.utils.TestOnly; @@ -63,7 +63,7 @@ public abstract class PipelineMemoryEstimator { children.addAll(child); } - protected int getDependencyPipelineIndex() { + public int getDependencyPipelineIndex() { return dependencyPipelineIndex; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 144fa0fec85..7a5f52749aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.calc.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContex import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index a093c7832fd..edffb8a6015 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.calc.exception.MemoryNotEnoughException; import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContex import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index aad7b56cddb..bedfe1aeff1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -36,6 +36,7 @@ import org.apache.iotdb.calc.execution.operator.process.fill.constant.FloatConst import org.apache.iotdb.calc.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.calc.execution.operator.process.fill.constant.LongConstantFill; import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TAggregationType; @@ -159,7 +160,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ColumnTransformerVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java index 8431e887a0a..fe2ee5fbac2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; public class ConsumeAllChildrenPipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java index d2f292053c0..e099c8e5398 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.commons.utils.TestOnly; public class ConsumeChildrenOneByOnePipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index 5ad9cbca619..bd35e003ec7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 1fd7c42bc84..585418a48d3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeAllChildrenPipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; -import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode;
