This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch dev_merge_stra in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 6653cec7c9026f14d5df2adff6111c7952428777 Author: EJTTianyu <[email protected]> AuthorDate: Fri Jun 12 15:19:14 2020 +0800 fix windows travis problem --- .../apache/iotdb/db/engine/merge/BaseFileSelector.java | 1 - .../apache/iotdb/db/engine/MetadataManagerHelper.java | 3 +-- .../org/apache/iotdb/db/engine/merge/MergeTest.java | 8 +++----- ...st.java => InplaceMaxFileMergeFileSelectorTest.java} | 2 +- .../{MergeLogTest.java => InplaceMergeLogTest.java} | 2 +- .../{MergePerfTest.java => InplaceMergePerfTest.java} | 4 ++-- .../{MergeTaskTest.java => InplaceMergeTaskTest.java} | 2 +- ...st.java => SqueezeMaxFileMergeFileSelectorTest.java} | 2 +- .../{MergeLogTest.java => SqueezeMergeLogTest.java} | 5 +++-- .../{MergeTaskTest.java => SqueezeMergeTaskTest.java} | 10 ++++++++-- ... => RegularizationMaxFileMergeFileSelectorTest.java} | 17 ++++++++++++++--- ...ergeLogTest.java => RegularizationMergeLogTest.java} | 5 +++-- ...geTaskTest.java => RegularizationMergeTaskTest.java} | 9 +++++++-- .../iotdb/db/integration/IoTDBSensorUpdateIT.java | 3 --- 14 files changed, 45 insertions(+), 28 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java index 53faaa6..951848f 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/BaseFileSelector.java @@ -61,7 +61,6 @@ public abstract class BaseFileSelector implements IMergeFileSelector { public Pair<MergeResource, SelectorContext> select() throws MergeException { selectorContext.setStartTime(System.currentTimeMillis()); - MergeResource resource = new MergeResource(); try { logger.info("Selecting merge candidates from {} seqFile, {} unseqFiles", seqFiles.size(), unseqFiles.size()); diff --git a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java index 78806da..19fe101 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/MetadataManagerHelper.java @@ -18,14 +18,13 @@ */ package org.apache.iotdb.db.engine; +import java.util.Collections; import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import java.util.Collections; - public class MetadataManagerHelper { public static void initMetadata() { 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 15626ba..c1584bb 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 @@ -26,15 +26,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Set; 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.cache.ChunkMetadataCache; import org.apache.iotdb.db.engine.merge.manage.MergeManager; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; -import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.exception.StorageEngineException; +import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.db.query.control.FileReaderManager; import org.apache.iotdb.db.utils.EnvironmentUtils; @@ -72,7 +71,7 @@ public abstract class MergeTest { @Before public void setUp() - throws IOException, WriteProcessException, MetadataException, MetadataException { + throws IOException, WriteProcessException, MetadataException { MManager.getInstance().init(); prevMergeChunkThreshold = IoTDBDescriptor.getInstance().getConfig().getChunkMergePointThreshold(); @@ -165,8 +164,7 @@ public abstract class MergeTest { } void prepareFile(TsFileResource tsFileResource, long timeOffset, long ptNum, - long valueOffset) - throws IOException, WriteProcessException { + long valueOffset) throws IOException, WriteProcessException { TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getFile()); for (String deviceId : deviceIds) { for (MeasurementSchema measurementSchema : measurementSchemas) { diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MaxFileMergeFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMaxFileMergeFileSelectorTest.java similarity index 98% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MaxFileMergeFileSelectorTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMaxFileMergeFileSelectorTest.java index 0e9dc43..ce5c147 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MaxFileMergeFileSelectorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMaxFileMergeFileSelectorTest.java @@ -33,7 +33,7 @@ import org.apache.iotdb.db.exception.MergeException; import org.apache.iotdb.tsfile.utils.Pair; import org.junit.Test; -public class MaxFileMergeFileSelectorTest extends MergeTest { +public class InplaceMaxFileMergeFileSelectorTest extends MergeTest { @Test public void testFullSelection() throws MergeException, IOException { diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeLogTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeLogTest.java similarity index 98% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeLogTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeLogTest.java index 5f586a9..a77b8b9 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeLogTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeLogTest.java @@ -41,7 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeLogTest extends MergeTest { +public class InplaceMergeLogTest extends MergeTest { File tempSGDir; diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergePerfTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergePerfTest.java similarity index 96% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergePerfTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergePerfTest.java index f0ace11..af3d776 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergePerfTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergePerfTest.java @@ -31,7 +31,7 @@ import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.metadata.MManager; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -public class MergePerfTest extends MergeTest { +public class InplaceMergePerfTest extends MergeTest { private long timeConsumption; private boolean fullMerge; @@ -58,7 +58,7 @@ public class MergePerfTest extends MergeTest { IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(-1); List<Long> timeConsumptions = new ArrayList<>(); - MergePerfTest perfTest = new MergePerfTest(); + InplaceMergePerfTest perfTest = new InplaceMergePerfTest(); perfTest.seqFileNum = 5; perfTest.unseqFileNum = 5; diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeTaskTest.java similarity index 99% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeTaskTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeTaskTest.java index ec22286..98e8889 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/MergeTaskTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/inplace/InplaceMergeTaskTest.java @@ -45,7 +45,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeTaskTest extends MergeTest { +public class InplaceMergeTaskTest extends MergeTest { private File tempSGDir; diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MaxFileMergeFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMaxFileMergeFileSelectorTest.java similarity index 97% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MaxFileMergeFileSelectorTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMaxFileMergeFileSelectorTest.java index 39175d1..c6238c7 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MaxFileMergeFileSelectorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMaxFileMergeFileSelectorTest.java @@ -34,7 +34,7 @@ import org.apache.iotdb.db.exception.MergeException; import org.apache.iotdb.tsfile.utils.Pair; import org.junit.Test; -public class MaxFileMergeFileSelectorTest extends MergeTest { +public class SqueezeMaxFileMergeFileSelectorTest extends MergeTest { @Test public void testFullSelection() throws MergeException, IOException { diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeLogTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeLogTest.java similarity index 94% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeLogTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeLogTest.java index 90fe4d6..ed654e3 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeLogTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeLogTest.java @@ -28,6 +28,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.List; import org.apache.commons.io.FileUtils; +import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.merge.MergeTest; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.seqMerge.squeeze.task.SqueezeMergeTask; @@ -39,14 +40,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeLogTest extends MergeTest { +public class SqueezeMergeLogTest extends MergeTest { private File tempSGDir; @Before public void setUp() throws IOException, WriteProcessException, MetadataException { super.setUp(); - tempSGDir = new File("tempSG"); + tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG")); tempSGDir.mkdirs(); } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java similarity index 95% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeTaskTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java index 35d139e..7593cf5 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeTaskTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.merge.MergeTest; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.seqMerge.squeeze.task.SqueezeMergeTask; @@ -45,22 +46,27 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeTaskTest extends MergeTest { +public class SqueezeMergeTaskTest extends MergeTest { private File tempSGDir; + private MergeSizeSelectorStrategy preMergeSizeSelectorStrategy; @Before public void setUp() throws IOException, WriteProcessException, MetadataException { super.setUp(); + preMergeSizeSelectorStrategy = IoTDBDescriptor.getInstance().getConfig() + .getMergeSizeSelectorStrategy(); IoTDBDescriptor.getInstance().getConfig().setMergeSizeSelectorStrategy( MergeSizeSelectorStrategy.TIME_RANGE); - tempSGDir = new File("tempSG"); + tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG")); tempSGDir.mkdirs(); } @After public void tearDown() throws IOException, StorageEngineException { super.tearDown(); + IoTDBDescriptor.getInstance().getConfig().setMergeSizeSelectorStrategy( + preMergeSizeSelectorStrategy); FileUtils.deleteDirectory(tempSGDir); } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MaxFileMergeFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMaxFileMergeFileSelectorTest.java similarity index 82% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MaxFileMergeFileSelectorTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMaxFileMergeFileSelectorTest.java index 989a2eb..1eaf24b 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MaxFileMergeFileSelectorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMaxFileMergeFileSelectorTest.java @@ -20,12 +20,10 @@ package org.apache.iotdb.db.engine.merge.sizeMerge.regularization; import static org.junit.Assert.assertEquals; -import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.merge.IMergeFileSelector; import org.apache.iotdb.db.engine.merge.MergeTest; import org.apache.iotdb.db.engine.merge.manage.MergeResource; @@ -33,21 +31,34 @@ import org.apache.iotdb.db.engine.merge.sizeMerge.regularization.selector.Regula import org.apache.iotdb.db.engine.merge.utils.SelectorContext; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.MergeException; +import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.MetadataException; import org.apache.iotdb.tsfile.exception.write.WriteProcessException; import org.apache.iotdb.tsfile.utils.Pair; +import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MaxFileMergeFileSelectorTest extends MergeTest { +public class RegularizationMaxFileMergeFileSelectorTest extends MergeTest { + + private int preChunkMergePointThreshold; @Before public void setUp() throws IOException, WriteProcessException, MetadataException { super.setUp(); + preChunkMergePointThreshold = IoTDBDescriptor.getInstance().getConfig() + .getChunkMergePointThreshold(); IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(100); } + @After + public void tearDown() throws IOException, StorageEngineException { + super.tearDown(); + IoTDBDescriptor.getInstance().getConfig() + .setChunkMergePointThreshold(preChunkMergePointThreshold); + } + @Test public void testFullSelection() throws MergeException, IOException { IMergeFileSelector mergeFileSelector = new RegularizationMaxFileSelector(seqResources, diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeLogTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeLogTest.java similarity index 94% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeLogTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeLogTest.java index e273ae1..53c2477 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeLogTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeLogTest.java @@ -28,6 +28,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.List; import org.apache.commons.io.FileUtils; +import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.merge.MergeTest; import org.apache.iotdb.db.engine.merge.manage.MergeResource; import org.apache.iotdb.db.engine.merge.sizeMerge.regularization.task.RegularizationMergeTask; @@ -39,14 +40,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeLogTest extends MergeTest { +public class RegularizationMergeLogTest extends MergeTest { private File tempSGDir; @Before public void setUp() throws IOException, WriteProcessException, MetadataException { super.setUp(); - tempSGDir = new File("tempSG"); + tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG")); tempSGDir.mkdirs(); } diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java similarity index 93% rename from server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeTaskTest.java rename to server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java index 24bad6e..62bbfa4 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeTaskTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java @@ -45,14 +45,17 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class MergeTaskTest extends MergeTest { +public class RegularizationMergeTaskTest extends MergeTest { private File tempSGDir; + private int preChunkMergePointThreshold; @Before public void setUp() - throws IOException, WriteProcessException, MetadataException, MetadataException { + throws IOException, WriteProcessException, MetadataException { super.setUp(); + preChunkMergePointThreshold = IoTDBDescriptor.getInstance().getConfig() + .getChunkMergePointThreshold(); IoTDBDescriptor.getInstance().getConfig().setChunkMergePointThreshold(100); tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG")); tempSGDir.mkdirs(); @@ -61,6 +64,8 @@ public class MergeTaskTest extends MergeTest { @After public void tearDown() throws IOException, StorageEngineException { super.tearDown(); + IoTDBDescriptor.getInstance().getConfig() + .setChunkMergePointThreshold(preChunkMergePointThreshold); FileUtils.deleteDirectory(tempSGDir); } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java index 9999f9b..c404297 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java @@ -25,8 +25,6 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.engine.merge.seqMerge.SeqMergeFileStrategy; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.junit.After; @@ -39,7 +37,6 @@ public class IoTDBSensorUpdateIT { public void setUp() throws Exception { EnvironmentUtils.closeStatMonitor(); EnvironmentUtils.envSetUp(); - IoTDBDescriptor.getInstance().getConfig().setSeqMergeFileStrategy(SeqMergeFileStrategy.INPLACE); Class.forName(Config.JDBC_DRIVER_NAME); }
