You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ne...@apache.org on 2021/06/16 06:22:08 UTC

[iotdb] branch rel/0.12 updated: [To rel/0.12] fix ci bug (#3412)

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

neuyilan 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 4968354  [To rel/0.12] fix ci bug (#3412)
4968354 is described below

commit 49683546c029650f84f7698e1c2c8152259eb9ac
Author: chaow <xu...@gmail.com>
AuthorDate: Wed Jun 16 14:21:38 2021 +0800

    [To rel/0.12] fix ci bug (#3412)
    
    * fix ci bug
    
    * fix log level
    
    * spotless apply
    
    Co-authored-by: chaow <94...@qq.com>
---
 .../org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
index fe5aeb2..ba2f269 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
 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.CompactionStrategy;
 import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner;
@@ -61,10 +62,15 @@ public class FileLoaderTest {
   private static final String SG_NAME = "root.sg";
   private String dataDir;
   private IFileLoader fileLoader;
+  private CompactionStrategy compactionStrategy;
 
   @Before
   public void setUp() throws Exception {
     IoTDBDescriptor.getInstance().getConfig().setSyncEnable(true);
+    compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
+    IoTDBDescriptor.getInstance()
+        .getConfig()
+        .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
     HashVirtualPartitioner.getInstance().setStorageGroupNum(1);
     EnvironmentUtils.closeStatMonitor();
     EnvironmentUtils.envSetUp();
@@ -87,6 +93,7 @@ public class FileLoaderTest {
   public void tearDown() throws IOException, StorageEngineException {
     EnvironmentUtils.cleanEnv();
     IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
+    IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy);
     HashVirtualPartitioner.getInstance()
         .setStorageGroupNum(IoTDBDescriptor.getInstance().getConfig().getVirtualStorageGroupNum());
   }