[iotdb] branch rel/0.12 updated: [To rel/0.12] Stop NO_COMPACTION strategy from submitting compaction task (#3685)

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 773fe94  [To rel/0.12] Stop NO_COMPACTION strategy from submitting 
compaction task (#3685)
773fe94 is described below

commit 773fe94c8e34468a26bc5afefbdf799db56c832c
Author: liuxuxin <37140360+thumark...@users.noreply.github.com>
AuthorDate: Thu Aug 5 10:27:03 2021 +0800

    [To rel/0.12] Stop NO_COMPACTION strategy from submitting compaction task 
(#3685)
---
 .../engine/storagegroup/StorageGroupProcessor.java | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 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 6e589d3..789092a 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
@@ -24,6 +24,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.conf.directories.DirectoryManager;
 import org.apache.iotdb.db.engine.StorageEngine;
 import org.apache.iotdb.db.engine.compaction.CompactionMergeTaskPoolManager;
+import org.apache.iotdb.db.engine.compaction.CompactionStrategy;
 import org.apache.iotdb.db.engine.compaction.StorageGroupCompactionTask;
 import org.apache.iotdb.db.engine.compaction.TsFileManagement;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
@@ -529,6 +530,10 @@ public class StorageGroupProcessor {
   }
 
   private void recoverCompaction() {
+    if (IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy()
+        == CompactionStrategy.NO_COMPACTION) {
+      return;
+    }
     if (!CompactionMergeTaskPoolManager.getInstance().isTerminated()) {
       logger.info(
           "{} - {} submit a compaction recover merge task",
@@ -1952,10 +1957,13 @@ public class StorageGroupProcessor {
         "signal closing storage group condition in {}",
         logicalStorageGroupName + "-" + virtualStorageGroupId);
 
-    CompactionMergeTaskPoolManager.getInstance()
-        .submitTask(
-            new CompactionOnePartitionTask(
-                logicalStorageGroupName, tsFileProcessor.getTimeRangeId()));
+    if (IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy()
+        == CompactionStrategy.LEVEL_COMPACTION) {
+      CompactionMergeTaskPoolManager.getInstance()
+          .submitTask(
+              new CompactionOnePartitionTask(
+                  logicalStorageGroupName, tsFileProcessor.getTimeRangeId()));
+    }
   }
 
   public class CompactionOnePartitionTask extends StorageGroupCompactionTask {
@@ -1992,6 +2000,10 @@ public class StorageGroupProcessor {
 
   /** close recover compaction merge callback, to start continuous compaction 
*/
   private void closeCompactionRecoverCallBack(boolean isMerge, long 
timePartitionId) {
+    if (IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy()
+        == CompactionStrategy.NO_COMPACTION) {
+      return;
+    }
     
CompactionMergeTaskPoolManager.getInstance().clearCompactionStatus(logicalStorageGroupName);
     if 
(IoTDBDescriptor.getInstance().getConfig().isEnableContinuousCompaction()) {
       logger.info(
@@ -2107,8 +2119,10 @@ public class StorageGroupProcessor {
   }
 
   public void merge() {
-    CompactionMergeTaskPoolManager.getInstance()
-        .submitTask(new CompactionAllPartitionTask(logicalStorageGroupName));
+    if (config.getCompactionStrategy() == CompactionStrategy.LEVEL_COMPACTION) 
{
+      CompactionMergeTaskPoolManager.getInstance()
+          .submitTask(new CompactionAllPartitionTask(logicalStorageGroupName));
+    }
   }
 
   /**