From 43b820a80c56f720a483fe7d61b3b796659eeb65 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 9 Jan 2025 16:43:21 +0800 Subject: [PATCH] spotless --- .../plan/analyze/load/LoadTsFileTreeSchemaCache.java | 1 - .../db/storageengine/dataregion/DataRegion.java | 1 - .../dataregion/tsfile/TsFileResource.java | 12 ++++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTreeSchemaCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTreeSchemaCache.java index 7de96e09adb5..3668954859c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTreeSchemaCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTreeSchemaCache.java @@ -25,7 +25,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; -import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; import org.apache.iotdb.db.storageengine.dataregion.modification.v1.ModificationFileV1; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.FileTimeIndex; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index a547160967a3..d6f0f50c7d66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -97,7 +97,6 @@ import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import org.apache.iotdb.db.storageengine.dataregion.modification.TreeDeletionEntry; -import org.apache.iotdb.db.storageengine.dataregion.modification.v1.ModificationFileV1; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceForRegionScan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java index d7de6752c48a..48e7d84c6acf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java @@ -1452,21 +1452,25 @@ public void upgradeModFile(ExecutorService upgradeModFileThreadPool) throws IOEx upgradeModFile(upgradeModFileThreadPool, true); } - public void upgradeModFile(ExecutorService upgradeModFileThreadPool, boolean removeOldModFile) throws IOException { + public void upgradeModFile(ExecutorService upgradeModFileThreadPool, boolean removeOldModFile) + throws IOException { ModificationFileV1 oldModFile = ModificationFileV1.getNormalMods(this); if (!oldModFile.exists()) { return; } if (upgradeModFileThreadPool != null) { - exclusiveModFileFuture = upgradeModFileThreadPool.submit(() -> doUpgradeModFile(oldModFile, remove())); + exclusiveModFileFuture = + upgradeModFileThreadPool.submit(() -> doUpgradeModFile(oldModFile, remove())); } else { - exclusiveModFileFuture = CompletableFuture.completedFuture(doUpgradeModFile(oldModFile, removeOldModFile)); + exclusiveModFileFuture = + CompletableFuture.completedFuture(doUpgradeModFile(oldModFile, removeOldModFile)); } } @SuppressWarnings({"java:S4042", "java:S899", "ResultOfMethodCallIgnored"}) - private ModificationFile doUpgradeModFile(ModificationFileV1 oldModFile, boolean removeOldModFile) throws IOException { + private ModificationFile doUpgradeModFile(ModificationFileV1 oldModFile, boolean removeOldModFile) + throws IOException { ModificationFile newMFile = ModificationFile.getExclusiveMods(this); newMFile.getFile().delete(); try {