diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java index f56e7cacb57c2..6991c9d392a34 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java +++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java @@ -107,6 +107,7 @@ private void setUp() throws StartupException { registerManager.register(TVListAllocator.getInstance()); registerManager.register(CacheHitRatioMonitor.getInstance()); JMXService.registerMBean(getInstance(), mbeanName); + registerManager.register(RPCService.getInstance()); registerManager.register(StorageEngine.getInstance()); // When registering statMonitor, we should start recovering some statistics @@ -116,7 +117,6 @@ private void setUp() throws StartupException { StatMonitor.getInstance().recovery(); } - registerManager.register(RPCService.getInstance()); if (IoTDBDescriptor.getInstance().getConfig().isEnableMetricService()) { registerManager.register(MetricsService.getInstance()); } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java index 2279ccb3909b5..0d8de6e8734ea 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java @@ -71,13 +71,16 @@ abstract class MergeTest { List unseqResources = new ArrayList<>(); private int prevMergeChunkThreshold; + private boolean prevEnableUnseqCompaction; @Before public void setUp() throws IOException, WriteProcessException, MetadataException { IoTDB.metaManager.init(); prevMergeChunkThreshold = IoTDBDescriptor.getInstance().getConfig().getMergeChunkPointNumberThreshold(); + prevEnableUnseqCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction(); IoTDBDescriptor.getInstance().getConfig().setMergeChunkPointNumberThreshold(-1); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(true); prepareSeries(); prepareFiles(seqFileNum, unseqFileNum); MergeManager.getINSTANCE().start(); @@ -88,7 +91,9 @@ public void tearDown() throws IOException, StorageEngineException { removeFiles(); seqResources.clear(); unseqResources.clear(); - IoTDBDescriptor.getInstance().getConfig().setMergeChunkPointNumberThreshold(prevMergeChunkThreshold); + IoTDBDescriptor.getInstance().getConfig() + .setMergeChunkPointNumberThreshold(prevMergeChunkThreshold); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction); ChunkCache.getInstance().clear(); ChunkMetadataCache.getInstance().clear(); TimeSeriesMetadataCache.getInstance().clear(); diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java index 330264eade946..ddbebcd3c4f10 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.integration; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.junit.After; @@ -105,6 +106,7 @@ public void setUp() throws Exception { EnvironmentUtils.closeStatMonitor(); prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval(); IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false); EnvironmentUtils.envSetUp(); Class.forName(Config.JDBC_DRIVER_NAME); prepareData(); diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBOverlappedPageIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBOverlappedPageIT.java index daea618651848..99be9f70b86a8 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBOverlappedPageIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBOverlappedPageIT.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.integration; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; @@ -53,6 +54,7 @@ public static void setUp() throws Exception { // max_number_of_points_in_page = 10 beforeMaxNumberOfPointsInPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(10); + EnvironmentUtils.envSetUp(); Class.forName(Config.JDBC_DRIVER_NAME); insertData(); diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java index 860ff453e83a7..61f25e3eb66be 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java @@ -29,7 +29,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.StorageEngine; +import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.IllegalPathException; import org.apache.iotdb.db.metadata.PartialPath; @@ -42,6 +44,7 @@ public class IoTDBRemovePartitionIT { private static int partitionInterval = 100; + private static CompactionStrategy compactionStrategy; @Before public void setUp() throws Exception { @@ -49,6 +52,10 @@ public void setUp() throws Exception { EnvironmentUtils.envSetUp(); StorageEngine.setEnablePartition(true); StorageEngine.setTimePartitionInterval(partitionInterval); + + compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy(); + IoTDBDescriptor.getInstance().getConfig() + .setCompactionStrategy(CompactionStrategy.NO_COMPACTION); insertData(); } @@ -56,6 +63,7 @@ public void setUp() throws Exception { public void tearDown() throws Exception { StorageEngine.setEnablePartition(false); StorageEngine.setTimePartitionInterval(-1); + IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy); EnvironmentUtils.cleanEnv(); } diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index 76782ab1d1042..421f8558d4b9f 100644 --- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -69,8 +69,8 @@ public class EnvironmentUtils { public static QueryContext TEST_QUERY_CONTEXT = new QueryContext(TEST_QUERY_JOB_ID); private static final long oldTsFileThreshold = config.getTsFileSizeThreshold(); - private static final long oldGroupSizeInByte = config.getMemtableSizeThreshold(); + private static final boolean oldEnableUnseqCompaction = config.isEnableUnseqCompaction(); private static IoTDB daemon; @@ -135,6 +135,7 @@ public static void cleanEnv() throws IOException, StorageEngineException { cleanAllDir(); config.setTsFileSizeThreshold(oldTsFileThreshold); config.setMemtableSizeThreshold(oldGroupSizeInByte); + config.setEnableUnseqCompaction(oldEnableUnseqCompaction); } @@ -233,6 +234,8 @@ public static void envSetUp() { //we do not start 8181 port in test. IoTDBDescriptor.getInstance().getConfig().setEnableMetricService(false); IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(Integer.MAX_VALUE); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false); + if (daemon == null) { daemon = new IoTDB(); }