This is an automated email from the ASF dual-hosted git repository.
ejttianyu pushed a commit to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/dev_new_merge by this push:
new f44add6 test file
f44add6 is described below
commit f44add6805a5d8b165b49cb3836bfeb896875b66
Author: EJTTianyu <[email protected]>
AuthorDate: Fri Jun 12 16:58:11 2020 +0800
test file
---
.../apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeLogTest.java | 3 ++-
.../apache/iotdb/db/engine/merge/seqMerge/squeeze/MergeTaskTest.java | 3 ++-
.../iotdb/db/engine/merge/sizeMerge/regularization/MergeLogTest.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
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/MergeLogTest.java
index 90fe4d6..374ae8c 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/MergeLogTest.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;
@@ -46,7 +47,7 @@ public class MergeLogTest extends MergeTest {
@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/MergeTaskTest.java
index 35d139e..44c2d5c 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/MergeTaskTest.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;
@@ -54,7 +55,7 @@ public class MergeTaskTest extends MergeTest {
super.setUp();
IoTDBDescriptor.getInstance().getConfig().setMergeSizeSelectorStrategy(
MergeSizeSelectorStrategy.TIME_RANGE);
- 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/MergeLogTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/MergeLogTest.java
index e273ae1..9a1ebd9 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/MergeLogTest.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;
@@ -46,7 +47,7 @@ public class MergeLogTest extends MergeTest {
@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();
}