You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/11/11 11:36:29 UTC
[iotdb] branch travis_ci_rel/0.11 created (now aa8551c)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch travis_ci_rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at aa8551c [To rel/0.11] Try to fix travis failed tests
This branch includes the following new commits:
new aa8551c [To rel/0.11] Try to fix travis failed tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: [To rel/0.11] Try to fix travis failed tests
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch travis_ci_rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa8551c1b46f872ae41ea1287e8e014e16df147a
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Wed Nov 11 19:35:27 2020 +0800
[To rel/0.11] Try to fix travis failed tests
---
.../src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java | 7 ++++++-
.../org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java | 8 ++++++++
.../src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 5 ++++-
3 files changed, 18 insertions(+), 2 deletions(-)
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 2279ccb..0d8de6e 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<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();
@@ -88,7 +91,9 @@ abstract class MergeTest {
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/IoTDBRemovePartitionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
index 860ff45..61f25e3 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.sql.Statement;
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 @@ import org.junit.Test;
public class IoTDBRemovePartitionIT {
private static int partitionInterval = 100;
+ private static CompactionStrategy compactionStrategy;
@Before
public void setUp() throws Exception {
@@ -49,6 +52,10 @@ public class IoTDBRemovePartitionIT {
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 class IoTDBRemovePartitionIT {
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 76782ab..421f855 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 class EnvironmentUtils {
cleanAllDir();
config.setTsFileSizeThreshold(oldTsFileThreshold);
config.setMemtableSizeThreshold(oldGroupSizeInByte);
+ config.setEnableUnseqCompaction(oldEnableUnseqCompaction);
}
@@ -233,6 +234,8 @@ public class EnvironmentUtils {
//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();
}