This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch pr_1758 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cefce8954808b24f6493add1a5367dee8c77f09c Author: 张凌哲 <[email protected]> AuthorDate: Wed Oct 14 15:42:53 2020 +0800 update test --- .../test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java index c4df986..5fb599a 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java @@ -42,14 +42,16 @@ public class IoTDBMergeTest { private static final Logger logger = LoggerFactory.getLogger(IoTDBMergeTest.class); private long prevPartitionInterval; + private TsFileManagementStrategy prevTsFileManagementStrategy; @Before public void setUp() throws Exception { EnvironmentUtils.closeStatMonitor(); prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval(); + prevTsFileManagementStrategy = IoTDBDescriptor.getInstance().getConfig().getTsFileManagementStrategy(); IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1); IoTDBDescriptor.getInstance().getConfig() - .setTsFileManagementStrategy(TsFileManagementStrategy.LEVEL_STRATEGY); + .setTsFileManagementStrategy(TsFileManagementStrategy.NORMAL_STRATEGY); EnvironmentUtils.envSetUp(); Class.forName(Config.JDBC_DRIVER_NAME); } @@ -59,7 +61,7 @@ public class IoTDBMergeTest { EnvironmentUtils.cleanEnv(); IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval); IoTDBDescriptor.getInstance().getConfig() - .setTsFileManagementStrategy(TsFileManagementStrategy.NORMAL_STRATEGY); + .setTsFileManagementStrategy(prevTsFileManagementStrategy); } @Test @@ -294,7 +296,7 @@ public class IoTDBMergeTest { } // it is uncertain whether the sub tasks are created at this time point, and we are only // sure that the main task is created - assertEquals(2, cnt); + assertEquals(5, cnt); } } }
