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 f8214d6 try fix
f8214d6 is described below
commit f8214d6a8dee28f2abe97ff6ebadac6d4fb22f25
Author: EJTTianyu <[email protected]>
AuthorDate: Fri Jun 12 19:27:45 2020 +0800
try fix
---
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java | 1 -
...FileSelectorTest.java => InplaceMaxFileMergeFileSelectorTest.java} | 2 +-
.../seqMerge/inplace/{MergeLogTest.java => InplaceMergeLogTest.java} | 2 +-
.../inplace/{MergePerfTest.java => InplaceMergePerfTest.java} | 4 ++--
.../inplace/{MergeTaskTest.java => InplaceMergeTaskTest.java} | 2 +-
...FileSelectorTest.java => SqueezeMaxFileMergeFileSelectorTest.java} | 2 +-
.../seqMerge/squeeze/{MergeLogTest.java => SqueezeMergeLogTest.java} | 2 +-
.../squeeze/{MergeTaskTest.java => SqueezeMergeTaskTest.java} | 2 +-
...ectorTest.java => RegularizationMaxFileMergeFileSelectorTest.java} | 2 +-
.../{MergeLogTest.java => RegularizationMergeLogTest.java} | 2 +-
.../{MergeTaskTest.java => RegularizationMergeTaskTest.java} | 2 +-
11 files changed, 11 insertions(+), 12 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 287e3c1..ef56e73 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
@@ -196,7 +196,6 @@ public abstract class MergeTest {
fileWriter.flushAllChunkGroups();
}
}
-
fileWriter.writeVersion(tsFileResource.getHistoricalVersions().iterator().next());
fileWriter.close();
} catch (Exception e){
logger.error("meet error when prepare data files: {}, reason:{}",
e.getMessage(), e);
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 98%
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 374ae8c..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
@@ -40,7 +40,7 @@ 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;
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 99%
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 44c2d5c..c96d6c4 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
@@ -46,7 +46,7 @@ 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;
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 97%
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..9ba4c0f 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
@@ -39,7 +39,7 @@ import org.apache.iotdb.tsfile.utils.Pair;
import org.junit.Before;
import org.junit.Test;
-public class MaxFileMergeFileSelectorTest extends MergeTest {
+public class RegularizationMaxFileMergeFileSelectorTest extends MergeTest {
@Before
public void setUp()
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 98%
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 9a1ebd9..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
@@ -40,7 +40,7 @@ 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;
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 98%
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..12d4e1a 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,7 +45,7 @@ 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;
