This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch make_flush_thread_class_static in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f33b9f7c84df40ceb019e70ecaf929d0696d8e8d Author: HTHou <[email protected]> AuthorDate: Sun Jan 12 09:47:06 2025 +0800 Make FlushThread as static class --- .../db/storageengine/dataregion/flush/FlushManager.java | 13 ++++--------- .../dataregion/flush/pool/FlushSubTaskPoolManager.java | 2 +- .../dataregion/flush/pool/FlushTaskPoolManager.java | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/FlushManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/FlushManager.java index 9e526e8267b..80107e9068c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/FlushManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/FlushManager.java @@ -29,18 +29,13 @@ import org.apache.iotdb.db.storageengine.dataregion.flush.pool.FlushSubTaskPoolM import org.apache.iotdb.db.storageengine.dataregion.flush.pool.FlushTaskPoolManager; import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; @SuppressWarnings("squid:S6548") public class FlushManager implements FlushManagerMBean, IService { - private static final Logger LOGGER = LoggerFactory.getLogger(FlushManager.class); - - private FlushTaskPoolManager flushPool = FlushTaskPoolManager.getInstance(); + private final FlushTaskPoolManager flushPool = FlushTaskPoolManager.getInstance(); @Override public void start() throws StartupException { @@ -91,8 +86,7 @@ public class FlushManager implements FlushManagerMBean, IService { return FlushSubTaskPoolManager.getInstance().getWaitingTasksNumber(); } - /** a flush thread handles flush task */ - class FlushThread extends WrappedRunnable { + static class FlushThread extends WrappedRunnable { TsFileProcessor tsFileProcessor; @@ -109,6 +103,7 @@ public class FlushManager implements FlushManagerMBean, IService { tsFileProcessor.flushOneMemTable(); } tsFileProcessor.setManagedByFlushManager(false); + tsFileProcessor = null; } } @@ -143,7 +138,7 @@ public class FlushManager implements FlushManagerMBean, IService { private InstanceHolder() {} - private static FlushManager instance = new FlushManager(); + private static final FlushManager instance = new FlushManager(); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushSubTaskPoolManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushSubTaskPoolManager.java index 1cc75e2039c..635b52c84a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushSubTaskPoolManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushSubTaskPoolManager.java @@ -69,6 +69,6 @@ public class FlushSubTaskPoolManager extends AbstractPoolManager { // allowed to do nothing } - private static FlushSubTaskPoolManager instance = new FlushSubTaskPoolManager(); + private static final FlushSubTaskPoolManager instance = new FlushSubTaskPoolManager(); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushTaskPoolManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushTaskPoolManager.java index 65bb88d65b6..0b69f5dac82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushTaskPoolManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/flush/pool/FlushTaskPoolManager.java @@ -72,6 +72,6 @@ public class FlushTaskPoolManager extends AbstractPoolManager { // allowed to do nothing } - private static FlushTaskPoolManager instance = new FlushTaskPoolManager(); + private static final FlushTaskPoolManager instance = new FlushTaskPoolManager(); } }
