You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sh...@apache.org on 2025/12/03 02:21:12 UTC
(iotdb) 02/02: fix
This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch table_disk_usage_statistics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3fbf6a3c2001ac18e3243468f81c7d860dea8685
Author: shuwenwei <s1...@gmail.com>
AuthorDate: Wed Dec 3 10:20:49 2025 +0800
fix
---
.../iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java | 4 +---
.../plan/planner/memory/PipelineMemoryEstimatorFactory.java | 1 +
.../queryengine/statistics/FragmentInstanceStatisticsDrawer.java | 2 +-
.../db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java | 7 ++++---
4 files changed, 7 insertions(+), 7 deletions(-)
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 f063106450e..7cbcfee1f02 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
@@ -1184,9 +1184,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
context.getNextOperatorId(),
node.getPlanNodeId(),
CollectOperator.class.getSimpleName());
- List<Operator> children = dealWithConsumeAllChildrenPipelineBreaker(node, context);
- CollectOperator collectOperator = new CollectOperator(operatorContext, children);
- return collectOperator;
+ return new CollectOperator(operatorContext, dealWithConsumeChildrenOneByOneNode(node, context));
}
@Override
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 ea637b586e4..f02a5d109f6 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
@@ -43,6 +43,7 @@ public class PipelineMemoryEstimatorFactory {
case IDENTITY_SINK:
case SCHEMA_FETCH_MERGE:
case LAST_QUERY_COLLECT:
+ case TREE_COLLECT:
return true;
default:
return false;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java
index b9f1a55b5bd..7a8b7097eb9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java
@@ -484,7 +484,7 @@ public class FragmentInstanceStatisticsDrawer {
addLineWithValueCheck(
singleFragmentInstanceArea,
indentNum + 2,
- "Estimated Memory Size: ",
+ "Estimated Memory Size",
operatorStatistic.getMemoryUsage());
if (operatorStatistic.getSpecifiedInfoSize() != 0) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java
index 954726f0998..20e43010308 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java
@@ -108,10 +108,11 @@ public abstract class DiskUsageStatisticUtil implements Closeable {
public void calculateNextFile() {
TsFileResource tsFileResource = iterator.next();
+ if (tsFileResource.isDeleted()) {
+ return;
+ }
+ FileReaderManager.getInstance().increaseFileReaderReference(tsFileResource, true);
try {
- if (tsFileResource.isDeleted()) {
- return;
- }
TsFileSequenceReader reader =
FileReaderManager.getInstance()
.get(