You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2021/06/16 08:10:21 UTC
[iotdb] branch new_compaction updated: fix compile error
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch new_compaction
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_compaction by this push:
new b6ce433 fix compile error
b6ce433 is described below
commit b6ce4335d2ec769bddebdcddbf2108ff0f29ad0c
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Jun 16 16:09:46 2021 +0800
fix compile error
---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 28 ++--
.../org/apache/iotdb/db/engine/StorageEngine.java | 8 +-
.../engine/compaction/CompactionTaskManager.java | 6 +-
.../engine/compaction/TsFileResourceManager.java | 1 -
.../level/LevelCompactionTsFileManagement.java | 4 +-
.../engine/flush/pool/FlushSubTaskPoolManager.java | 1 -
.../db/engine/flush/pool/FlushTaskPoolManager.java | 1 -
.../db/engine/storagegroup/TsFileResource.java | 5 +-
.../db/engine/storagegroup/TsFileResourceList.java | 14 +-
.../virtualSg/StorageGroupManager.java | 5 +-
.../compaction/LevelCompactionMergeTest.java | 12 --
.../engine/modification/DeletionFileNodeTest.java | 10 --
.../db/engine/modification/DeletionQueryTest.java | 12 --
.../storagegroup/StorageGroupProcessorTest.java | 7 -
.../iotdb/db/engine/storagegroup/TTLTest.java | 9 --
.../iotdb/db/integration/IOTDBGroupByIT.java | 7 -
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 8 --
.../db/integration/IoTDBDeleteTimeseriesIT.java | 6 -
.../apache/iotdb/db/integration/IoTDBFillIT.java | 6 -
.../iotdb/db/integration/IoTDBGroupByMonthIT.java | 8 --
.../iotdb/db/integration/IoTDBGroupByUnseqIT.java | 4 -
.../iotdb/db/integration/IoTDBLargeDataIT.java | 6 -
.../db/integration/IoTDBLevelCompactionIT.java | 156 ---------------------
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 34 ++---
.../db/integration/IoTDBLoadExternalTsfileIT.java | 7 -
.../apache/iotdb/db/integration/IoTDBMergeIT.java | 7 -
.../iotdb/db/integration/IoTDBMultiDeviceIT.java | 6 -
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 13 +-
.../db/integration/IoTDBMultiOverlappedPageIT.java | 7 -
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 7 -
.../db/integration/IoTDBMultiStatementsIT.java | 7 -
.../db/integration/IoTDBNewTsFileCompactionIT.java | 14 --
.../db/integration/IoTDBOverlappedPageIT.java | 11 --
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 6 -
.../aggregation/IoTDBAggregationIT.java | 6 -
.../aggregation/IoTDBAggregationLargeDataIT.java | 6 -
.../aggregation/IoTDBAggregationSmallDataIT.java | 6 -
37 files changed, 44 insertions(+), 417 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index b35a9fa..dd6c281 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -298,34 +298,28 @@ public class IoTDBConfig {
/** When average series point number reaches this, flush the memtable to disk */
private int avgSeriesPointNumberThreshold = 10000;
- /**
- * Only compact the sequence files
- */
+ /** Only compact the sequence files */
private boolean enableSeqSpaceCompaction = true;
- /**
- * Only compact the unsequence files
- */
+ /** Only compact the unsequence files */
private boolean enableUnseqSpaceCompaction = true;
- /**
- * Compact the unsequence files into the overlapped sequence files
- */
+ /** Compact the unsequence files into the overlapped sequence files */
private boolean enableCrossSpaceCompaction = true;
/**
- * The priority of compaction task execution. There are three priority strategy
- * INNER_CROSS: prioritize inner space compaction, reduce the number of files first
- * CROSS INNER: prioritize cross space compaction, eliminate the unsequence files first
- * BALANCE: alternate two compaction types
+ * The priority of compaction task execution. There are three priority strategy INNER_CROSS:
+ * prioritize inner space compaction, reduce the number of files first CROSS INNER: prioritize
+ * cross space compaction, eliminate the unsequence files first BALANCE: alternate two compaction
+ * types
*/
private CompactionPriority compactionPriority = CompactionPriority.INNER_CROSS;
/**
- * When merge point number reaches this, merge the files to the last level. During a merge,
- * if a chunk with less number of chunks than this parameter, the chunk will be merged with
- * its succeeding chunks even if it is not overflowed,
- * until the merged chunks reach this threshold and the new chunk will be flushed.
+ * When merge point number reaches this, merge the files to the last level. During a merge, if a
+ * chunk with less number of chunks than this parameter, the chunk will be merged with its
+ * succeeding chunks even if it is not overflowed, until the merged chunks reach this threshold
+ * and the new chunk will be flushed.
*/
private int mergeChunkPointNumberThreshold = 100000;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 43c5118..22d6207 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -440,8 +440,7 @@ public class StorageEngine implements IService {
private StorageGroupProcessor getStorageGroupProcessorByPath(
PartialPath devicePath, StorageGroupMNode storageGroupMNode)
throws StorageGroupProcessorException, StorageEngineException {
- StorageGroupManager storageGroupManager =
- processorMap.get(storageGroupMNode.getPartialPath());
+ StorageGroupManager storageGroupManager = processorMap.get(storageGroupMNode.getPartialPath());
if (storageGroupManager == null) {
// if finish recover
if (isAllSgReady.get()) {
@@ -616,7 +615,7 @@ public class StorageEngine implements IService {
}
private void updateMonitorStatistics(
- StorageGroupManager storageGroupManager, InsertPlan insertPlan) {
+ StorageGroupManager storageGroupManager, InsertPlan insertPlan) {
StatMonitor monitor = StatMonitor.getInstance();
int successPointsNum =
insertPlan.getMeasurements().length - insertPlan.getFailedMeasurementNumber();
@@ -812,8 +811,7 @@ public class StorageEngine implements IService {
deleteAllDataFilesInOneStorageGroup(storageGroupPath);
releaseWalDirectByteBufferPoolInOneStorageGroup(storageGroupPath);
StorageGroupManager storageGroupManager = processorMap.remove(storageGroupPath);
- storageGroupManager.deleteStorageGroup(
- systemDir + File.pathSeparator + storageGroupPath);
+ storageGroupManager.deleteStorageGroup(systemDir + File.pathSeparator + storageGroupPath);
}
public void loadNewTsFileForSync(TsFileResource newTsFileResource)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
index 5877470..542d160 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
@@ -49,10 +49,8 @@ import static org.apache.iotdb.db.engine.compaction.utils.CompactionLogger.COMPA
/** CompactionMergeTaskPoolManager provides a ThreadPool to queue and run all compaction tasks. */
public class CompactionTaskManager implements IService {
- private static final Logger logger =
- LoggerFactory.getLogger(CompactionTaskManager.class);
- private static final CompactionTaskManager INSTANCE =
- new CompactionTaskManager();
+ private static final Logger logger = LoggerFactory.getLogger(CompactionTaskManager.class);
+ private static final CompactionTaskManager INSTANCE = new CompactionTaskManager();
private ExecutorService pool;
private Map<String, Set<Future<Void>>> storageGroupTasks = new ConcurrentHashMap<>();
private AtomicInteger currentTaskNum = new AtomicInteger(0);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileResourceManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileResourceManager.java
index ba7fcc2..9ce0cb7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileResourceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileResourceManager.java
@@ -24,5 +24,4 @@ import org.slf4j.LoggerFactory;
public class TsFileResourceManager {
private static final Logger LOGGER = LoggerFactory.getLogger(TsFileResourceManager.class);
-
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
index c15ffea..eb02544 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
@@ -64,9 +64,7 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
LoggerFactory.getLogger(LevelCompactionTsFileManagement.class);
private final int seqLevelNum = 0;
- private final int seqFileNumInEachLevel = 0;
private final int unseqLevelNum = 0;
- private final int unseqFileNumInEachLevel = 0;
private final boolean enableUnseqCompaction = false;
@@ -588,6 +586,7 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
@Override
protected void merge(long timePartition) {
+ int seqFileNumInEachLevel = 0;
isMergeExecutedInCurrentTask =
merge(
forkedSequenceTsFileResources, true, timePartition, seqLevelNum, seqFileNumInEachLevel);
@@ -601,6 +600,7 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
forkedUnSequenceTsFileResources.get(0),
Long.MAX_VALUE);
} else {
+ int unseqFileNumInEachLevel = 0;
isMergeExecutedInCurrentTask =
merge(
forkedUnSequenceTsFileResources,
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushSubTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushSubTaskPoolManager.java
index 966f279..1ff6d92 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushSubTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushSubTaskPoolManager.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.db.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.db.concurrent.ThreadName;
import org.apache.iotdb.db.rescon.AbstractPoolManager;
-import org.apache.iotdb.db.rescon.AbstractPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
index b6ecf73..f9c1e50 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.db.concurrent.ThreadName;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.rescon.AbstractPoolManager;
-import org.apache.iotdb.db.rescon.AbstractPoolManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index a307bdd..3f0ccbe 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -89,10 +89,9 @@ public class TsFileResource {
/** version number */
public static final byte VERSION_NUMBER = 1;
- /**
- * Used in {@link TsFileResourceList TsFileResourceList}
- */
+ /** Used in {@link TsFileResourceList TsFileResourceList} */
protected TsFileResource prev;
+
protected TsFileResource next;
public TsFileProcessor getProcessor() {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceList.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceList.java
index c9c4dd4..2ff3163 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceList.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceList.java
@@ -34,7 +34,7 @@ public class TsFileResourceList implements List<TsFileResource> {
/**
* Insert a new node before an existing node
*
- * @param node the existing node
+ * @param node the existing node
* @param newNode the new node to insert
*/
public void insertBefore(TsFileResource node, TsFileResource newNode) {
@@ -97,9 +97,7 @@ public class TsFileResourceList implements List<TsFileResource> {
return new TsFileResourceIterator();
}
- /**
- * Insert a new tsFileResource node to the end of List
- */
+ /** Insert a new tsFileResource node to the end of List */
@Override
public boolean add(TsFileResource tsFileResource) {
if (tail == null) {
@@ -113,9 +111,7 @@ public class TsFileResourceList implements List<TsFileResource> {
return true;
}
- /**
- * The tsFileResource to be removed must be in the list, otherwise may cause unknown behavior
- */
+ /** The tsFileResource to be removed must be in the list, otherwise may cause unknown behavior */
@Override
public boolean remove(Object o) {
TsFileResource tsFileResource = (TsFileResource) o;
@@ -136,9 +132,7 @@ public class TsFileResourceList implements List<TsFileResource> {
return false;
}
- /**
- * Only List type parameter is legal, because it is in order.
- */
+ /** Only List type parameter is legal, because it is in order. */
@Override
public boolean addAll(Collection<? extends TsFileResource> c) {
if (c instanceof List) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
index d5be0f5..394c7a0 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/StorageGroupManager.java
@@ -41,10 +41,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-/**
- * Each storage group that set by users corresponds to a StorageGroupManager
- */
+/** Each storage group that set by users corresponds to a StorageGroupManager */
public class StorageGroupManager {
/** logger of this class */
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
index a71ef40..539fde7 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
@@ -116,10 +116,6 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
/** just compaction stable list */
@Test
public void testCompactionMergeStableList() throws IllegalPathException, IOException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(2);
LevelCompactionTsFileManagement levelCompactionTsFileManagement =
new LevelCompactionTsFileManagement(COMPACTION_TEST_SG, tempSGDir.getPath());
levelCompactionTsFileManagement.addAll(seqResources, true);
@@ -158,8 +154,6 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
}
}
assertEquals(500, count);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/**
@@ -308,10 +302,6 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
@Test
public void testCompactionDiffTimeSeries()
throws IOException, WriteProcessException, IllegalPathException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(2);
List<TsFileResource> compactionFiles = prepareTsFileResources();
LevelCompactionTsFileManagement levelCompactionTsFileManagement =
new LevelCompactionTsFileManagement(COMPACTION_TEST_SG, tempSGDir.getPath());
@@ -369,7 +359,5 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
}
}
assertEquals(count, 1);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
index bfe9522..eb4d722 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.engine.modification;
-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.modification.io.LocalTextModificationAccessor;
@@ -73,12 +72,9 @@ public class DeletionFileNodeTest {
private String processorName = "root.test";
private TSDataType dataType = TSDataType.DOUBLE;
private TSEncoding encoding = TSEncoding.PLAIN;
- private int prevUnseqLevelNum = 0;
@Before
public void setup() throws MetadataException {
- prevUnseqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(2);
EnvironmentUtils.envSetUp();
IoTDB.metaManager.setStorageGroup(new PartialPath(processorName));
@@ -95,14 +91,8 @@ public class DeletionFileNodeTest {
@After
public void teardown() throws IOException, StorageEngineException {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnseqLevelNum);
}
- private void insertToStorageEngine(TSRecord record)
- throws StorageEngineException, IllegalPathException {
- InsertRowPlan insertRowPlan = new InsertRowPlan(record);
- StorageEngine.getInstance().insert(insertRowPlan);
- }
@Test
public void testDeleteInBufferWriteCache()
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
index 7375045..09c5495 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.engine.modification;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
@@ -60,8 +59,6 @@ public class DeletionQueryTest {
private TSEncoding encoding = TSEncoding.PLAIN;
private QueryRouter router = new QueryRouter();
- private int prevUnseqLevelNum = 0;
-
static {
for (int i = 0; i < 10; i++) {
measurements[i] = "m" + i;
@@ -70,8 +67,6 @@ public class DeletionQueryTest {
@Before
public void setup() throws MetadataException {
- prevUnseqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(2);
EnvironmentUtils.envSetUp();
IoTDB.metaManager.setStorageGroup(new PartialPath(processorName));
for (int i = 0; i < 10; i++) {
@@ -87,13 +82,6 @@ public class DeletionQueryTest {
@After
public void teardown() throws IOException, StorageEngineException {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnseqLevelNum);
- }
-
- private void insertToStorageEngine(TSRecord record)
- throws StorageEngineException, IllegalPathException {
- InsertRowPlan insertRowPlan = new InsertRowPlan(record);
- StorageEngine.getInstance().insert(insertRowPlan);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
index 3d7e2b6..8486e36 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
@@ -22,7 +22,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.MetadataManagerHelper;
-import org.apache.iotdb.db.engine.compaction.CompactionStrategy;
import org.apache.iotdb.db.engine.flush.TsFileFlushPolicy;
import org.apache.iotdb.db.engine.merge.manage.MergeManager;
import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
@@ -69,9 +68,6 @@ public class StorageGroupProcessorTest {
@Before
public void setUp() throws Exception {
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
MetadataManagerHelper.initMetadata();
EnvironmentUtils.envSetUp();
processor = new DummySGP(systemDir, storageGroup);
@@ -85,9 +81,6 @@ public class StorageGroupProcessorTest {
EnvironmentUtils.cleanDir(TestConstant.OUTPUT_DATA_DIR);
MergeManager.getINSTANCE().stop();
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
private void insertToStorageGroupProcessor(TSRecord record)
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
index db4f812..3ccc68f 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
@@ -83,12 +83,9 @@ public class TTLTest {
private String s1 = "s1";
private String g1s1 = sg1 + IoTDBConstant.PATH_SEPARATOR + s1;
private long prevPartitionInterval;
- private int prevUnseqLevelNum;
@Before
public void setUp() throws MetadataException, StorageGroupProcessorException {
- prevUnseqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(2);
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(86400);
EnvironmentUtils.envSetUp();
@@ -100,12 +97,6 @@ public class TTLTest {
storageGroupProcessor.syncCloseAllWorkingTsFileProcessors();
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnseqLevelNum);
- }
-
- private void insertToStorageGroupProcessor(InsertRowPlan insertPlan)
- throws WriteProcessException, TriggerExecutionException {
- storageGroupProcessor.insert(insertPlan);
}
private void createSchemas() throws MetadataException, StorageGroupProcessorException {
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 3e99996..1eb5220 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,7 +20,6 @@
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.qp.logical.crud.AggregationQueryOperator;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
@@ -118,9 +117,6 @@ public class IOTDBGroupByIT {
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -131,9 +127,6 @@ public class IOTDBGroupByIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAlignByDeviceIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAlignByDeviceIT.java
index a57d6d3..6906b92 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAlignByDeviceIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAlignByDeviceIT.java
@@ -18,8 +18,6 @@
*/
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;
@@ -103,18 +101,12 @@ public class IoTDBAlignByDeviceIT {
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
EnvironmentUtils.envSetUp();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
insertData();
}
@AfterClass
public static void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
private static void insertData() throws ClassNotFoundException {
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java
index 558d7ba..333089f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteTimeseriesIT.java
@@ -38,7 +38,6 @@ import java.sql.Statement;
public class IoTDBDeleteTimeseriesIT {
private long memtableSizeThreshold;
- private CompactionStrategy tsFileManagementStrategy;
@Before
public void setUp() {
@@ -46,16 +45,11 @@ public class IoTDBDeleteTimeseriesIT {
EnvironmentUtils.envSetUp();
memtableSizeThreshold = IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(16);
- tsFileManagementStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
}
@After
public void tearDown() throws Exception {
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(memtableSizeThreshold);
- IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(tsFileManagementStrategy);
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
index 1647f29..702d09e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFillIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.db.integration;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
@@ -129,13 +128,9 @@ public class IoTDBFillIT {
private static final String STATUS_STR_2 = "root.ln.wf01.wt02.status";
private static final String HARDWARE_STR = "root.ln.wf01.wt01.hardware";
- boolean prevEnableUnseqCompaction;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- prevEnableUnseqCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -144,7 +139,6 @@ public class IoTDBFillIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
index 76e0dba..027fd2b 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
@@ -18,8 +18,6 @@
*/
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;
@@ -46,9 +44,6 @@ public class IoTDBGroupByMonthIT {
@Before
public void setUp() throws Exception {
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
df.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -58,9 +53,6 @@ public class IoTDBGroupByMonthIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
/**
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByUnseqIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByUnseqIT.java
index e515612..b0de3e3 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByUnseqIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByUnseqIT.java
@@ -74,15 +74,12 @@ public class IoTDBGroupByUnseqIT {
"flush"
};
- private boolean enableUnseqCompaction;
private int maxNumberOfPointsInPage;
@Before
public void setUp() throws Exception {
Class.forName(Config.JDBC_DRIVER_NAME);
EnvironmentUtils.closeStatMonitor();
- enableUnseqCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
maxNumberOfPointsInPage =
TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(4);
@@ -92,7 +89,6 @@ public class IoTDBGroupByUnseqIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(enableUnseqCompaction);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(maxNumberOfPointsInPage);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
index a0fbae6..bb4cfdc 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
@@ -56,9 +56,6 @@ public class IoTDBLargeDataIT {
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
// use small page setting
// origin value
@@ -85,9 +82,6 @@ public class IoTDBLargeDataIT {
tsFileConfig.setPageSizeInByte(pageSizeInByte);
tsFileConfig.setGroupSizeInByte(groupSizeInByte);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLevelCompactionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLevelCompactionIT.java
index b04b4e3..30a037d 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLevelCompactionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLevelCompactionIT.java
@@ -19,7 +19,6 @@
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;
@@ -37,15 +36,9 @@ import static org.junit.Assert.assertEquals;
public class IoTDBLevelCompactionIT {
- CompactionStrategy prevCompactionStrategy;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- prevCompactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@@ -53,16 +46,11 @@ public class IoTDBLevelCompactionIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(prevCompactionStrategy);
}
/** test compaction files num > MAX_FILE_NUM_IN_LEVEL * MAX_LEVEL_NUM */
@Test
public void test() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -105,20 +93,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(flushCount, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction first use deserialize merge and then use append merge */
@Test
public void testAppendMergeAfterDeserializeMerge() throws SQLException {
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -167,21 +146,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(1, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
}
/** test compaction first use append merge and then use deserialize merge */
@Test
public void testDeserializeMergeAfterAppendMerge() throws SQLException {
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -239,16 +208,9 @@ public class IoTDBLevelCompactionIT {
.getConfig()
.setMergePagePointNumberThreshold(prevMergePagePointNumberThreshold);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
}
private void testCompactionNoUnseq(int mergeCount) throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -290,8 +252,6 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(mergeCount, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction just once, no unseq */
@@ -303,10 +263,6 @@ public class IoTDBLevelCompactionIT {
/** test compaction to just once, with unseq */
@Test
public void testCompactionOnceWithUnseq() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -351,8 +307,6 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(2, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction to second level once, no unseq */
@@ -364,10 +318,6 @@ public class IoTDBLevelCompactionIT {
/** test compaction to second level once, with unseq */
@Test
public void testCompactionToSecondLevelWithUnseq() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -425,19 +375,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(5, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction to second level once, with unseq, disable unseqCompaction */
@Test
public void testCompactionToSecondLevelWithUnseqDisableUnseqCompaction() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -495,9 +437,6 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(5, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
}
/** test compaction to stable level once, No unseq */
@@ -509,10 +448,6 @@ public class IoTDBLevelCompactionIT {
/** test compaction to stable level once, with unseq */
@Test
public void testCompactionToStableLevelWithUnseq() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -570,19 +505,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction to stable level once, with unseq, disable unseqCompaction */
@Test
public void testCompactionToStableLevelWithUnseqDisableUnseqCompaction() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -640,18 +567,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
}
/** test seq max level num = 0 */
@Test
public void testCompactionSeqMaxLevelNumError0() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(0);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -709,17 +629,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test seq max level num = -1 */
@Test
public void testCompactionSeqMaxLevelNumError1() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(-1);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -777,17 +691,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test seq file num in each level = 0 */
@Test
public void testCompactionSeqFileNumInEachLevelError0() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(0);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -845,17 +753,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test seq max level num = -1 */
@Test
public void testCompactionSeqFileNumInEachLevelError1() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(-1);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -913,25 +815,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(12, cnt);
}
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
}
/** test compaction with unseq compaction */
@Test
public void testCompactionWithUnseqCompaction() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- int prevUnSeqLevelFileNum =
- IoTDBDescriptor.getInstance().getConfig().getUnseqFileNumInEachLevel();
- int prevUnSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -989,7 +877,6 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(55, cnt);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(true);
for (int i = 10010; i < 10055; i++) {
statement.execute(
String.format(
@@ -1013,29 +900,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(100, cnt);
}
-
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(prevUnSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnSeqLevelNum);
}
/** test compaction with deletion timeseries */
@Test
public void testCompactionWithDeletionTimeseries() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- int prevUnSeqLevelFileNum =
- IoTDBDescriptor.getInstance().getConfig().getUnseqFileNumInEachLevel();
- int prevUnSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -1084,29 +953,11 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(2, cnt);
}
-
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(prevUnSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnSeqLevelNum);
}
/** test compaction with deletion timeseries and create different type */
@Test
public void testCompactionWithDeletionTimeseriesAndCreateDifferentTypeTest() throws SQLException {
- int prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- int prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
- int prevUnSeqLevelFileNum =
- IoTDBDescriptor.getInstance().getConfig().getUnseqFileNumInEachLevel();
- int prevUnSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getUnseqLevelNum();
- boolean prevEnableUnseqCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(3);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(3);
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -1168,7 +1019,6 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(55, cnt);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(true);
for (int i = 10010; i < 10055; i++) {
statement.execute(
String.format(
@@ -1190,11 +1040,5 @@ public class IoTDBLevelCompactionIT {
}
assertEquals(100, cnt);
}
-
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(prevEnableUnseqCompaction);
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqFileNumInEachLevel(prevUnSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnSeqLevelNum);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
index d991123..d12be59 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
@@ -54,25 +54,23 @@ import java.util.Arrays;
public class IoTDBLoadExternalTsFileWithTimePartitionIT {
- String DOT = ".";
- String tempDir = "temp";
+ private String DOT = ".";
+ private String tempDir = "temp";
- String STORAGE_GROUP = "root.ln";
- String[] devices = new String[] {"d1", "d2"};
- String[] measurements = new String[] {"s1", "s2"};
+ private String STORAGE_GROUP = "root.ln";
+ private String[] devices = new String[] {"d1", "d2"};
+ private String[] measurements = new String[] {"s1", "s2"};
// generate several tsFiles, with timestamp from startTime(inclusive) to endTime(exclusive)
- long startTime = 0;
- long endTime = 1000_000;
+ private long startTime = 0;
+ private long endTime = 1000_000;
- long timePartition = 100; // unit s
+ private long timePartition = 100; // unit s
- long recordTimeGap = 1000;
+ private int originalTsFileNum = 0;
- int originalTsFileNum = 0;
-
- boolean originalIsEnablePartition;
- long originalPartitionInterval;
+ private boolean originalIsEnablePartition;
+ private long originalPartitionInterval;
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
@@ -93,9 +91,6 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
StorageEngine.setEnablePartition(originalIsEnablePartition);
StorageEngine.setTimePartitionInterval(originalPartitionInterval);
File f = new File(tempDir);
@@ -105,12 +100,12 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
}
/** get the name of tsfile given counter */
- String getName(int counter) {
+ private String getName(int counter) {
return tempDir + File.separator + System.currentTimeMillis() + "-" + counter + "-0.tsfile";
}
/** write a record, given timestamp */
- void writeData(TsFileWriter tsFileWriter, long timestamp)
+ private void writeData(TsFileWriter tsFileWriter, long timestamp)
throws IOException, WriteProcessException {
for (String deviceId : devices) {
TSRecord tsRecord = new TSRecord(timestamp, STORAGE_GROUP + DOT + deviceId);
@@ -123,7 +118,7 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
}
/** register all timeseries in tsfiles */
- void register(TsFileWriter tsFileWriter) {
+ private void register(TsFileWriter tsFileWriter) {
try {
for (String deviceId : devices) {
for (String measurement : measurements) {
@@ -148,6 +143,7 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
File f;
TsFileWriter tsFileWriter = null;
int counter = 0;
+ long recordTimeGap = 1000;
for (long timestamp = startTime; timestamp < endTime; timestamp += recordTimeGap) {
if (timestamp % (timePartition * recordTimeGap) == 0) {
if (tsFileWriter != null) {
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
index f1a149f..2aa2f0e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.conf.IoTDBConfig;
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.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.timeindex.TimeIndexLevel;
import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner;
@@ -133,9 +132,6 @@ public class IoTDBLoadExternalTsfileIT {
@Before
public void setUp() throws Exception {
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
IoTDBDescriptor.getInstance().getConfig().setVirtualStorageGroupNum(1);
HashVirtualPartitioner.getInstance().setStorageGroupNum(1);
EnvironmentUtils.closeStatMonitor();
@@ -148,9 +144,6 @@ public class IoTDBLoadExternalTsfileIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
IoTDBDescriptor.getInstance().getConfig().setVirtualStorageGroupNum(virtualPartitionNum);
HashVirtualPartitioner.getInstance().setStorageGroupNum(virtualPartitionNum);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeIT.java
index 3daad5e..b961982 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeIT.java
@@ -43,18 +43,12 @@ public class IoTDBMergeIT {
private static final Logger logger = LoggerFactory.getLogger(IoTDBMergeIT.class);
private long prevPartitionInterval;
- private CompactionStrategy prevTsFileManagementStrategy;
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- prevTsFileManagementStrategy =
- IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@@ -63,7 +57,6 @@ public class IoTDBMergeIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
- IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(prevTsFileManagementStrategy);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiDeviceIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiDeviceIT.java
index 5ffac74..114994d 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiDeviceIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiDeviceIT.java
@@ -55,9 +55,6 @@ public class IoTDBMultiDeviceIT {
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
// use small page setting
// origin value
@@ -89,9 +86,6 @@ public class IoTDBMultiDeviceIT {
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
TSFileDescriptor.getInstance().getConfig().setCompressor("SNAPPY");
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
private static void insertData() throws ClassNotFoundException {
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
index 8619705..4063483 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
@@ -43,15 +43,12 @@ import static org.junit.Assert.fail;
*/
public class IoTDBMultiOverlappedChunkInUnseqIT {
- private static long beforeMemtableSizeThreshold;
+ private static long previousMemtableSizeThreshold;
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
- beforeMemtableSizeThreshold =
+ previousMemtableSizeThreshold =
IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024);
EnvironmentUtils.envSetUp();
@@ -63,10 +60,8 @@ public class IoTDBMultiOverlappedChunkInUnseqIT {
public static void tearDown() throws Exception {
// recovery value
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(beforeMemtableSizeThreshold);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
+ IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(
+ previousMemtableSizeThreshold);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
index 87d6739..fdde039 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
@@ -20,7 +20,6 @@
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;
@@ -51,9 +50,6 @@ public class IoTDBMultiOverlappedPageIT {
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
beforeMemtableSizeThreshold =
IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
@@ -74,9 +70,6 @@ public class IoTDBMultiOverlappedPageIT {
.setMaxNumberOfPointsInPage(beforeMaxNumberOfPointsInPage);
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(beforeMemtableSizeThreshold);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
index b74d43c..4e459d7 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
-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.TSFileConfig;
@@ -60,9 +59,6 @@ public class IoTDBMultiSeriesIT {
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
// use small page setting
// origin value
@@ -94,9 +90,6 @@ public class IoTDBMultiSeriesIT {
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
TSFileDescriptor.getInstance().getConfig().setCompressor("SNAPPY");
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
private static void insertData() throws ClassNotFoundException {
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
index 633a0ee..4ac361f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiStatementsIT.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
-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.TSFileConfig;
@@ -53,9 +52,6 @@ public class IoTDBMultiStatementsIT {
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
// use small page setting
// origin value
@@ -81,9 +77,6 @@ public class IoTDBMultiStatementsIT {
tsFileConfig.setPageSizeInByte(pageSizeInByte);
tsFileConfig.setGroupSizeInByte(groupSizeInByte);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
EnvironmentUtils.cleanEnv();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
index c327ef1..46e441d 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
@@ -46,11 +46,8 @@ import static org.junit.Assert.fail;
public class IoTDBNewTsFileCompactionIT {
- private int prevSeqLevelFileNum;
- private int prevSeqLevelNum;
private int prevMergePagePointNumber;
private int preMaxNumberOfPointsInPage;
- private CompactionStrategy preCompactionStrategy;
private PartialPath storageGroupPath;
// the unit is ns
private static final long MAX_WAIT_TIME_FOR_MERGE = Long.MAX_VALUE;
@@ -59,21 +56,13 @@ public class IoTDBNewTsFileCompactionIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
- prevSeqLevelFileNum = IoTDBDescriptor.getInstance().getConfig().getSeqFileNumInEachLevel();
- prevSeqLevelNum = IoTDBDescriptor.getInstance().getConfig().getSeqLevelNum();
prevMergePagePointNumber =
IoTDBDescriptor.getInstance().getConfig().getMergePagePointNumberThreshold();
preMaxNumberOfPointsInPage =
TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
- preCompactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
storageGroupPath = new PartialPath("root.sg1");
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(2);
IoTDBDescriptor.getInstance().getConfig().setMergePagePointNumberThreshold(1);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(1);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -89,15 +78,12 @@ public class IoTDBNewTsFileCompactionIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setSeqFileNumInEachLevel(prevSeqLevelFileNum);
- IoTDBDescriptor.getInstance().getConfig().setSeqLevelNum(prevSeqLevelNum);
IoTDBDescriptor.getInstance()
.getConfig()
.setMergePagePointNumberThreshold(prevMergePagePointNumber);
TSFileDescriptor.getInstance()
.getConfig()
.setMaxNumberOfPointsInPage(preMaxNumberOfPointsInPage);
- IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(preCompactionStrategy);
}
/**
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 8cb9f27..2aa3153 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,7 +20,6 @@
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;
@@ -45,7 +44,6 @@ import static org.junit.Assert.fail;
public class IoTDBOverlappedPageIT {
private static int beforeMaxNumberOfPointsInPage;
- private static boolean enableUnseqCompaction;
private static String[] dataSet1 =
new String[] {
@@ -72,11 +70,6 @@ public class IoTDBOverlappedPageIT {
public static void setUp() throws Exception {
Class.forName(Config.JDBC_DRIVER_NAME);
EnvironmentUtils.closeStatMonitor();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
- enableUnseqCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(false);
// max_number_of_points_in_page = 10
beforeMaxNumberOfPointsInPage =
@@ -91,10 +84,6 @@ public class IoTDBOverlappedPageIT {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance()
.getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqCompaction(enableUnseqCompaction);
- IoTDBDescriptor.getInstance()
- .getConfig()
.setMemtableSizeThreshold(beforeMaxNumberOfPointsInPage);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
index 27b8abc..c95d2eb 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
@@ -90,9 +90,6 @@ public class IoTDBSeriesReaderIT {
tsFileConfig.setGroupSizeInByte(1024 * 1024 * 150);
prevChunkMergePointThreshold =
IoTDBDescriptor.getInstance().getConfig().getMergeChunkPointNumberThreshold();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
IoTDBDescriptor.getInstance().getConfig().setMergeChunkPointNumberThreshold(Integer.MAX_VALUE);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
@@ -116,9 +113,6 @@ public class IoTDBSeriesReaderIT {
tsFileConfig.setGroupSizeInByte(groupSizeInByte);
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
IoTDBDescriptor.getInstance()
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationIT.java
index d837f0b..fcb8c2f 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationIT.java
@@ -109,9 +109,6 @@ public class IoTDBAggregationIT {
EnvironmentUtils.closeStatMonitor();
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -121,9 +118,6 @@ public class IoTDBAggregationIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
// add test for part of points in page don't satisfy filter
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
index 943fd3d..dd7eb2b 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationLargeDataIT.java
@@ -117,9 +117,6 @@ public class IoTDBAggregationLargeDataIT {
public void setUp() {
EnvironmentUtils.closeStatMonitor();
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
EnvironmentUtils.envSetUp();
}
@@ -127,9 +124,6 @@ public class IoTDBAggregationLargeDataIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
index 2129284..0d81107 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBAggregationSmallDataIT.java
@@ -118,18 +118,12 @@ public class IoTDBAggregationSmallDataIT {
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
EnvironmentUtils.envSetUp();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
insertSQL();
}
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
}
@Test