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/10 06:49:16 UTC
[iotdb] branch travis_ci created (now 99f6660)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch travis_ci
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 99f6660 Try to fix travis failed tests
This branch includes the following new commits:
new 99f6660 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: 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
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 99f6660ded514af0d6c9909910afd77108db97b0
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Tue Nov 10 14:48:41 2020 +0800
Try to fix travis failed tests
---
.../test/java/org/apache/iotdb/db/integration/IOTDBGroupByIT.java | 5 +++++
.../org/apache/iotdb/db/integration/IoTDBOverlappedPageIT.java | 8 ++++++++
2 files changed, 13 insertions(+)
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 330264e..a0fbffb 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;
@@ -99,12 +100,15 @@ public class IOTDBGroupByIT {
private static final String TIMESTAMP_STR = "Time";
private long prevPartitionInterval;
+ private static CompactionStrategy compactionStrategy;
@Before
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -114,6 +118,7 @@ public class IOTDBGroupByIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy);
}
@Test
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 daea618..d4e9475 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;
@@ -44,15 +45,21 @@ public class IoTDBOverlappedPageIT {
private static int beforeMaxNumberOfPointsInPage;
private static long beforeMemtableSizeThreshold;
+ private static CompactionStrategy beforeCompactionStrategy;
@BeforeClass
public static void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
beforeMemtableSizeThreshold = IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
+
+ beforeCompactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
+
// 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();
@@ -64,6 +71,7 @@ public class IoTDBOverlappedPageIT {
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(beforeMaxNumberOfPointsInPage);
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(beforeMemtableSizeThreshold);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(beforeCompactionStrategy);
}
@Test