You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/06/12 13:05:08 UTC
[incubator-iotdb] branch dev_new_merge updated: fix1
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 270b148 fix1
270b148 is described below
commit 270b148835dd0b969ea8cb5e02f2dbf72add03e8
Author: EJTTianyu <16...@qq.com>
AuthorDate: Fri Jun 12 21:04:38 2020 +0800
fix1
---
.../java/org/apache/iotdb/db/engine/merge/MergeTest.java | 5 ++---
.../merge/seqMerge/squeeze/SqueezeMergeTaskTest.java | 5 +++++
.../RegularizationMaxFileMergeFileSelectorTest.java | 15 +++++++++++++--
.../regularization/RegularizationMergeTaskTest.java | 7 ++++++-
4 files changed, 26 insertions(+), 6 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 ef56e73..bce6c0f 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,19 +26,17 @@ 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;
-import org.apache.iotdb.tsfile.encoding.encoder.DeltaBinaryEncoder;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -196,6 +194,7 @@ 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/squeeze/SqueezeMergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java
index c96d6c4..7593cf5 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/seqMerge/squeeze/SqueezeMergeTaskTest.java
@@ -49,10 +49,13 @@ import org.junit.Test;
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(TestConstant.BASE_OUTPUT_PATH.concat("tempSG"));
@@ -62,6 +65,8 @@ public class SqueezeMergeTaskTest extends MergeTest {
@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/RegularizationMaxFileMergeFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMaxFileMergeFileSelectorTest.java
index 9ba4c0f..1eaf24b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMaxFileMergeFileSelectorTest.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 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/RegularizationMergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java
index 12d4e1a..62bbfa4 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/sizeMerge/regularization/RegularizationMergeTaskTest.java
@@ -48,11 +48,14 @@ import org.junit.Test;
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 RegularizationMergeTaskTest extends MergeTest {
@After
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
+ IoTDBDescriptor.getInstance().getConfig()
+ .setChunkMergePointThreshold(preChunkMergePointThreshold);
FileUtils.deleteDirectory(tempSGDir);
}