This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch pr_1758 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6d0ad92305906a3ae682b8561c7f6655e930e526 Author: 张凌哲 <[email protected]> AuthorDate: Thu Sep 24 15:11:16 2020 +0800 remove more --- .../engine/storagegroup/StorageGroupProcessor.java | 4 +- .../level/LevelTsFileManagement.java | 72 +++++++++++----------- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java index 0011532..bf09d1b 100755 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.io.FileUtils; @@ -1579,8 +1578,7 @@ public class StorageGroupProcessor { .submitTask( tsFileManagement.new HotCompactionMergeTask(this::closeHotCompactionMergeCallBack, tsFileProcessor.getTimeRangeId())); - } catch (RejectedExecutionException | IOException e) { - e.printStackTrace(); + } catch (IOException e) { this.closeHotCompactionMergeCallBack(); logger.error("{} hot compaction submit task failed", storageGroupName); } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java index d5ac754..2ad1de0 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java @@ -497,47 +497,47 @@ public class LevelTsFileManagement extends TsFileManagement { // deviceSet.size()); HotCompactionLogger hotCompactionLogger = new HotCompactionLogger(storageGroupDir, storageGroupName); - if (deviceSet.size() > 0 && pointNum / deviceSet.size() > IoTDBDescriptor.getInstance() - .getConfig().getMergeChunkPointNumberThreshold()) { - // merge all tsfile to last level - logger.info("{} merge {} level tsfiles to next level", storageGroupName, - mergeResources.size()); - flushAllFilesToLastLevel(timePartition, mergeResources, hotCompactionLogger, sequence); - } else { - for (int i = 0; i < maxLevelNum - 1; i++) { - if (maxFileNumInEachLevel <= mergeResources.get(i).size()) { - for (TsFileResource mergeResource : mergeResources.get(i)) { - hotCompactionLogger.logFile(SOURCE_NAME, mergeResource.getTsFile()); - } - File newLevelFile = createNewTsFileName(mergeResources.get(i).get(0).getTsFile(), - i + 1); - hotCompactionLogger.logSequence(sequence); - hotCompactionLogger.logFile(TARGET_NAME, newLevelFile); - logger.info("{} [Hot Compaction] merge level-{}'s {} tsfiles to next level vm", - storageGroupName, i, mergeResources.get(i).size()); +// if (deviceSet.size() > 0 && pointNum / deviceSet.size() > IoTDBDescriptor.getInstance() +// .getConfig().getMergeChunkPointNumberThreshold()) { +// // merge all tsfile to last level +// logger.info("{} merge {} level tsfiles to next level", storageGroupName, +// mergeResources.size()); +// flushAllFilesToLastLevel(timePartition, mergeResources, hotCompactionLogger, sequence); +// } else { + for (int i = 0; i < maxLevelNum - 1; i++) { + if (maxFileNumInEachLevel <= mergeResources.get(i).size()) { + for (TsFileResource mergeResource : mergeResources.get(i)) { + hotCompactionLogger.logFile(SOURCE_NAME, mergeResource.getTsFile()); + } + File newLevelFile = createNewTsFileName(mergeResources.get(i).get(0).getTsFile(), + i + 1); + hotCompactionLogger.logSequence(sequence); + hotCompactionLogger.logFile(TARGET_NAME, newLevelFile); + logger.info("{} [Hot Compaction] merge level-{}'s {} tsfiles to next level vm", + storageGroupName, i, mergeResources.get(i).size()); - TsFileResource newResource = new TsFileResource(newLevelFile); - HotCompactionUtils - .merge(newResource, mergeResources.get(i), storageGroupName, hotCompactionLogger, - new HashSet<>(), sequence); - writeLock(); - try { - deleteLevelFiles(timePartition, mergeResources.get(i)); - hotCompactionLogger.logMergeFinish(); - if (sequence) { - sequenceTsFileResources.get(timePartition).get(i + 1).add(newResource); - } else { - unSequenceTsFileResources.get(timePartition).get(i + 1).add(newResource); - } - if (mergeResources.size() > i + 1) { - mergeResources.get(i + 1).add(newResource); - } - } finally { - writeUnlock(); + TsFileResource newResource = new TsFileResource(newLevelFile); + HotCompactionUtils + .merge(newResource, mergeResources.get(i), storageGroupName, hotCompactionLogger, + new HashSet<>(), sequence); + writeLock(); + try { + deleteLevelFiles(timePartition, mergeResources.get(i)); + hotCompactionLogger.logMergeFinish(); + if (sequence) { + sequenceTsFileResources.get(timePartition).get(i + 1).add(newResource); + } else { + unSequenceTsFileResources.get(timePartition).get(i + 1).add(newResource); } + if (mergeResources.size() > i + 1) { + mergeResources.get(i + 1).add(newResource); + } + } finally { + writeUnlock(); } } } +// } hotCompactionLogger.close(); File logFile = FSFactoryProducer.getFSFactory() .getFile(storageGroupDir, storageGroupName + HOT_COMPACTION_LOG_NAME);
