This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch calc_commons in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c48b443a53d7cfa7ed6cd81c5f89af2b5f6138c1 Author: shuwenwei <[email protected]> AuthorDate: Fri Apr 17 14:34:48 2026 +0800 modify serializeUseTemplate --- .../iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java | 6 ++---- .../apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java | 2 +- .../queryengine/plan/planner/plan/node/process/DeviceViewNode.java | 5 ++--- .../db/queryengine/plan/planner/plan/node/process/FilterNode.java | 5 ++--- .../db/queryengine/plan/planner/plan/node/process/ProjectNode.java | 5 ++--- .../plan/planner/plan/node/process/SingleDeviceViewNode.java | 5 ++--- .../planner/plan/node/source/AlignedSeriesAggregationScanNode.java | 3 +-- .../plan/planner/plan/node/source/AlignedSeriesScanNode.java | 3 +-- 8 files changed, 13 insertions(+), 21 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java index caa22a9848a..51a8f42b070 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java @@ -22,7 +22,6 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -158,8 +157,7 @@ public abstract class PlanNode implements IConsensusRequest { } } - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { serializeAttributes(stream); id.serialize(stream); List<PlanNode> planNodes = getChildren(); @@ -168,7 +166,7 @@ public abstract class PlanNode implements IConsensusRequest { } else { ReadWriteIOUtils.write(planNodes.size(), stream); for (PlanNode planNode : planNodes) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java index d65524ac61d..56c8b957e41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java @@ -199,7 +199,7 @@ public class PlanFragment { // so there is no need to serialize all the SeriesScanNode repeated if (typeProvider.getTemplatedInfo() != null) { typeProvider.serialize(stream); - planNodeTree.serializeUseTemplate(stream, typeProvider); + planNodeTree.serializeUseTemplate(stream); return; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 464b8cc89b5..66ee6cff4bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -215,8 +215,7 @@ public class DeviceViewNode extends MultiChildProcessNode { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.DEVICE_VIEW.serialize(stream); id.serialize(stream); mergeOrderParameter.serializeAttributes(stream); @@ -227,7 +226,7 @@ public class DeviceViewNode extends MultiChildProcessNode { ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 996cd48fd0f..11b4c402d4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -123,8 +123,7 @@ public class FilterNode extends TransformNode { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.FILTER.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(fromWhere, stream); @@ -140,7 +139,7 @@ public class FilterNode extends TransformNode { } ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 7e00d756426..6972c0f0f63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -104,13 +104,12 @@ public class ProjectNode extends SingleChildProcessNode { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.PROJECT.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 40149d06bb2..afce68715fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -176,15 +176,14 @@ public class SingleDeviceViewNode extends SingleChildProcessNode { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.SINGLE_DEVICE_VIEW.serialize(stream); id.serialize(stream); device.serialize(stream); ReadWriteIOUtils.write(cacheOutputColumnNames, stream); ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 0251dbdaa80..ba1454f9ad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -279,8 +279,7 @@ public class AlignedSeriesAggregationScanNode extends SeriesAggregationSourceNod } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.ALIGNED_SERIES_AGGREGATE_SCAN.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(alignedPath.getNodes().length, stream); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 88be2ddd980..ece77b530bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -200,8 +200,7 @@ public class AlignedSeriesScanNode extends SeriesScanSourceNode { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.ALIGNED_SERIES_SCAN.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(alignedPath.getNodes().length, stream);
