(iotdb) branch load_v2 updated: fix double initialization of TsFileDataManager

[jiangtian]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch load_v2
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/load_v2 by this push:
     new c2e7ea8f33b fix double initialization of TsFileDataManager
c2e7ea8f33b is described below

commit c2e7ea8f33b207a6a5a2021deb5892689fb00262
Author: Tian Jiang <jt2594...@163.com>
AuthorDate: Mon Nov 20 09:00:19 2023 +0800

    fix double initialization of TsFileDataManager
---
 .../queryengine/execution/load/TsFileDataManager.java |  4 ++++
 .../plan/scheduler/load/LoadTsFileScheduler.java      | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/TsFileDataManager.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/TsFileDataManager.java
index fa5aa285ed7..bb97a2293bd 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/TsFileDataManager.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/TsFileDataManager.java
@@ -170,4 +170,8 @@ public class TsFileDataManager {
     }
     return true;
   }
+
+  public void clear() {
+    replicaSet2Piece.clear();
+  }
 }
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
index 6d94ab8a38b..56807c4731b 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
@@ -28,8 +28,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.consensus.ConsensusGroupId;
 import org.apache.iotdb.commons.consensus.DataRegionId;
 import org.apache.iotdb.commons.exception.IoTDBException;
-import org.apache.iotdb.commons.partition.DataPartition;
-import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
 import org.apache.iotdb.commons.partition.StorageExecutor;
 import org.apache.iotdb.commons.service.metric.MetricService;
 import org.apache.iotdb.commons.service.metric.enums.Metric;
@@ -200,16 +198,15 @@ public class LoadTsFileScheduler implements IScheduler {
   }
 
   private boolean firstPhase(LoadSingleTsFileNode node) {
-    final TsFileDataManager tsFileDataManager = new TsFileDataManager(this, 
node);
+    final TsFileDataManager tsFileDataManager =
+        new TsFileDataManager(
+            this::dispatchOnePieceNode,
+            node.getPlanNodeId(),
+            node.getTsFileResource().getTsFile(),
+            partitionFetcher,
+            MAX_MEMORY_SIZE,
+            queryContext.getSession().getUserName());
     try {
-      TsFileDataManager tsFileDataManager =
-          new TsFileDataManager(
-              this::dispatchOnePieceNode,
-              node.getPlanNodeId(),
-              node.getTsFileResource().getTsFile(),
-              partitionFetcher,
-              MAX_MEMORY_SIZE,
-              queryContext.getSession().getUserName());
       new TsFileSplitter(
               node.getTsFileResource().getTsFile(), 
tsFileDataManager::addOrSendTsFileData, 0)
           .splitTsFileByDataPartition();