Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,16 @@ abstract class MergeTest {
List<TsFileResource> 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();
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,20 +44,26 @@
public class IoTDBRemovePartitionIT {

private static int partitionInterval = 100;
private static CompactionStrategy compactionStrategy;

@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
EnvironmentUtils.envSetUp();
StorageEngine.setEnablePartition(true);
StorageEngine.setTimePartitionInterval(partitionInterval);

compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
IoTDBDescriptor.getInstance().getConfig()
.setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
insertData();
}

@After
public void tearDown() throws Exception {
StorageEngine.setEnablePartition(false);
StorageEngine.setTimePartitionInterval(-1);
IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy);
EnvironmentUtils.cleanEnv();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -135,6 +135,7 @@ public static void cleanEnv() throws IOException, StorageEngineException {
cleanAllDir();
config.setTsFileSizeThreshold(oldTsFileThreshold);
config.setMemtableSizeThreshold(oldGroupSizeInByte);
config.setEnableUnseqCompaction(oldEnableUnseqCompaction);
}


Expand Down Expand Up @@ -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();
}
Expand Down