You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/12/09 05:55:45 UTC
[iotdb] branch virtual_partition_2_merge updated: fix test
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch virtual_partition_2_merge
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/virtual_partition_2_merge by this push:
new 1ad5655 fix test
1ad5655 is described below
commit 1ad565527b33067b02553ad75fca33986d8f4333
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Wed Dec 9 13:55:25 2020 +0800
fix test
---
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 13 -------------
.../org/apache/iotdb/db/engine/merge/task/MergeTask.java | 7 +------
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 9 ---------
.../java/org/apache/iotdb/db/engine/merge/MergeLogTest.java | 4 ----
.../org/apache/iotdb/db/engine/merge/MergeOverLapTest.java | 4 ----
.../org/apache/iotdb/db/engine/merge/MergeTaskTest.java | 5 +----
.../iotdb/db/engine/modification/DeletionFileNodeTest.java | 4 ----
.../db/engine/storagegroup/StorageGroupProcessorTest.java | 4 ----
.../org/apache/iotdb/db/integration/IoTDBAggregationIT.java | 4 ++++
.../apache/iotdb/db/integration/IoTDBRemovePartitionIT.java | 5 -----
10 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index e324323..55fc73b 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -789,11 +789,6 @@ public class IoTDBConfig {
private boolean debugState = false;
/**
- * whether we enable virtual partition
- */
- private boolean enableVirtualPartition = true;
-
- /**
* the number of virtual partition
*/
private int virtualPartitionNum = 8;
@@ -2110,14 +2105,6 @@ public class IoTDBConfig {
this.defaultIndexWindowRange = defaultIndexWindowRange;
}
- public boolean isEnableVirtualPartition() {
- return enableVirtualPartition;
- }
-
- public void setEnableVirtualPartition(boolean enableVirtualPartition) {
- this.enableVirtualPartition = enableVirtualPartition;
- }
-
public int getVirtualPartitionNum() {
return virtualPartitionNum;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
index e407496..26316b5 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
@@ -33,8 +33,6 @@ import org.apache.iotdb.db.engine.merge.manage.MergeContext;
import org.apache.iotdb.db.engine.merge.manage.MergeResource;
import org.apache.iotdb.db.engine.merge.recover.MergeLogger;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner;
-import org.apache.iotdb.db.engine.storagegroup.virtualSg.VirtualPartitioner;
import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.metadata.mnode.MNode;
@@ -55,7 +53,6 @@ public class MergeTask implements Callable<Void> {
public static final String MERGE_SUFFIX = ".merge";
private static final Logger logger = LoggerFactory.getLogger(MergeTask.class);
- private static final VirtualPartitioner partitioner = HashVirtualPartitioner.getInstance();
MergeResource resource;
String storageGroupSysDir;
@@ -125,9 +122,7 @@ public class MergeTask implements Callable<Void> {
mergeLogger.logFiles(resource);
- Set<PartialPath> devices;
-
- devices = IoTDB.metaManager.getDevices(new PartialPath(storageGroupName));
+ Set<PartialPath> devices = IoTDB.metaManager.getDevices(new PartialPath(storageGroupName));
Map<PartialPath, MeasurementSchema> measurementSchemaMap = new HashMap<>();
List<PartialPath> unmergedSeries = new ArrayList<>();
for (PartialPath device : devices) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 4699396..ee7b9b7 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1505,15 +1505,6 @@ public class StorageGroupProcessor {
}
}
- // virtual partition will push deletion to all sg
- if(!IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition()){
- // There is no tsfile data, the delete operation is invalid
- if (lastUpdateTime == null) {
- logger.debug("No device {} in SG {}, deletion invalid", device, storageGroupName);
- return;
- }
- }
-
// delete Last cache record if necessary
tryToDeleteLastCache(device, path, startTime, endTime);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeLogTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeLogTest.java
index 86baa7e..61267c0 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeLogTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeLogTest.java
@@ -43,7 +43,6 @@ import org.junit.Test;
public class MergeLogTest extends MergeTest {
File tempSGDir;
- private static boolean enableVirtualPartition = false;
@Before
@@ -51,15 +50,12 @@ public class MergeLogTest extends MergeTest {
super.setUp();
tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG"));
tempSGDir.mkdirs();
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
}
@After
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
FileUtils.deleteDirectory(tempSGDir);
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
index a2a804c..26f465e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
@@ -55,7 +55,6 @@ import org.junit.Test;
public class MergeOverLapTest extends MergeTest {
private File tempSGDir;
- private static boolean enableVirtualPartition = false;
@Before
public void setUp()
@@ -64,15 +63,12 @@ public class MergeOverLapTest extends MergeTest {
super.setUp();
tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG"));
tempSGDir.mkdirs();
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
}
@After
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
FileUtils.deleteDirectory(tempSGDir);
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
@Override
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
index 6611fa3..84d873e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
@@ -48,22 +48,19 @@ import org.junit.Test;
public class MergeTaskTest extends MergeTest {
private File tempSGDir;
- private static boolean enableVirtualPartition = false;
@Before
public void setUp() throws IOException, WriteProcessException, MetadataException, MetadataException {
super.setUp();
tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG"));
- tempSGDir.mkdirs();IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
+ tempSGDir.mkdirs();
}
@After
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
FileUtils.deleteDirectory(tempSGDir);
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
index 08c2d1e..948b210 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
@@ -66,7 +66,6 @@ public class DeletionFileNodeTest {
private static String[] measurements = new String[10];
private TSDataType dataType = TSDataType.DOUBLE;
private TSEncoding encoding = TSEncoding.PLAIN;
- private static boolean enableVirtualPartition = false;
private int prevUnseqLevelNum = 0;
@@ -90,15 +89,12 @@ public class DeletionFileNodeTest {
encoding, TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
}
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
}
@After
public void teardown() throws IOException, StorageEngineException {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setUnseqLevelNum(prevUnseqLevelNum);
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
private void insertToStorageEngine(TSRecord record)
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
index 594b0a0..78dee2b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
@@ -62,7 +62,6 @@ public class StorageGroupProcessorTest {
private String measurementId = "s0";
private StorageGroupProcessor processor;
private QueryContext context = EnvironmentUtils.TEST_QUERY_CONTEXT;
- private static boolean enableVirtualPartition = false;
@Before
@@ -73,8 +72,6 @@ public class StorageGroupProcessorTest {
EnvironmentUtils.envSetUp();
processor = new DummySGP(systemDir, storageGroup);
MergeManager.getINSTANCE().start();
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
}
@After
@@ -86,7 +83,6 @@ public class StorageGroupProcessorTest {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig()
.setCompactionStrategy(CompactionStrategy.LEVEL_COMPACTION);
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
private void insertToStorageGroupProcessor(TSRecord record)
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
index c86294a..d6fe48a 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
@@ -51,6 +51,9 @@ public class IoTDBAggregationIT {
private static final String TEMPERATURE_STR = "root.ln.wf01.wt01.temperature";
private static String[] creationSqls = new String[]{
+ "SET STORAGE GROUP TO root.vehicle.d0",
+ "SET STORAGE GROUP TO root.vehicle.d1",
+
"CREATE TIMESERIES root.vehicle.d0.s0 WITH DATATYPE=INT32, ENCODING=RLE",
"CREATE TIMESERIES root.vehicle.d0.s1 WITH DATATYPE=INT64, ENCODING=RLE",
"CREATE TIMESERIES root.vehicle.d0.s2 WITH DATATYPE=FLOAT, ENCODING=RLE",
@@ -58,6 +61,7 @@ public class IoTDBAggregationIT {
"CREATE TIMESERIES root.vehicle.d0.s4 WITH DATATYPE=BOOLEAN, ENCODING=PLAIN"
};
private static String[] dataSet2 = new String[]{
+ "SET STORAGE GROUP TO root.ln.wf01.wt01",
"CREATE TIMESERIES root.ln.wf01.wt01.status WITH DATATYPE=BOOLEAN, ENCODING=PLAIN",
"CREATE TIMESERIES root.ln.wf01.wt01.temperature WITH DATATYPE=FLOAT, ENCODING=PLAIN",
"CREATE TIMESERIES root.ln.wf01.wt01.hardware WITH DATATYPE=INT32, ENCODING=PLAIN",
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
index 602741d..2a3930e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
@@ -29,7 +29,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
@@ -43,7 +42,6 @@ import org.junit.Test;
public class IoTDBRemovePartitionIT {
private static int partitionInterval = 100;
- private static boolean enableVirtualPartition = false;
@Before
public void setUp() throws Exception {
@@ -51,8 +49,6 @@ public class IoTDBRemovePartitionIT {
EnvironmentUtils.envSetUp();
StorageEngine.setEnablePartition(true);
StorageEngine.setTimePartitionInterval(partitionInterval);
- enableVirtualPartition = IoTDBDescriptor.getInstance().getConfig().isEnableVirtualPartition();
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(false);
insertData();
}
@@ -61,7 +57,6 @@ public class IoTDBRemovePartitionIT {
StorageEngine.setEnablePartition(false);
StorageEngine.setTimePartitionInterval(-1);
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setEnableVirtualPartition(enableVirtualPartition);
}
@Test