You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/08 04:03:17 UTC
[iotdb] branch issue4580 created (now d530191380)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch issue4580
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at d530191380 [IOTDB-4580] Unify TimePartitionInterval configration
This branch includes the following new commits:
new d530191380 [IOTDB-4580] Unify TimePartitionInterval configration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: [IOTDB-4580] Unify TimePartitionInterval configration
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch issue4580
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d5301913802dc7606433ad880b27491cde9dc686
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Oct 8 12:03:02 2022 +0800
[IOTDB-4580] Unify TimePartitionInterval configration
---
.../apache/iotdb/db/it/env/StandaloneEnvConfig.java | 4 ++--
.../apache/iotdb/db/integration/IoTDBCompactionIT.java | 3 ++-
.../db/integration/IoTDBCompactionWithIDTableIT.java | 3 ++-
.../IoTDBLoadExternalTsFileWithTimePartitionIT.java | 2 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 3 ++-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 9 ++++++---
.../iotdb/db/integration/IoTDBTimePartitionIT.java | 3 ++-
.../aggregation/IoTDBUDFNestAggregationIT.java | 3 ++-
.../IoTDBUserDefinedAggregationFunctionIT.java | 8 +++++---
.../aligned/IoTDBGroupByFillQueryBigDataIT.java | 3 ++-
.../integration/aligned/IoTDBGroupByFillQueryIT.java | 3 ++-
.../iotdb/db/integration/env/StandaloneEnvConfig.java | 2 +-
.../db/integration/groupby/IoTDBGroupByFillIT.java | 2 +-
.../groupby/IoTDBGroupByFillMixPathsIT.java | 2 +-
.../IoTDBDeletionVersionAdaptionIT.java | 3 ++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 --------------
.../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 -----
.../java/org/apache/iotdb/db/conf/IoTDBStartCheck.java | 2 +-
.../java/org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../sizetiered/SizeTieredCompactionSelectorTest.java | 5 +++--
.../iotdb/db/engine/storagegroup/DataRegionTest.java | 18 +++++++++---------
.../engine/storagegroup/StorageGroupProcessorTest.java | 18 +++++++++---------
.../apache/iotdb/db/engine/storagegroup/TTLTest.java | 9 ++++++---
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 6 +++---
.../apache/iotdb/db/utils/TsFileRewriteToolTest.java | 6 +++---
25 files changed, 68 insertions(+), 70 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
index 956a616193..c40e3141d2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
@@ -67,13 +67,13 @@ public class StandaloneEnvConfig implements BaseConfig {
@Override
public BaseConfig setPartitionInterval(long partitionInterval) {
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(partitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(partitionInterval);
return this;
}
@Override
public long getPartitionInterval() {
- return IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ return IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
}
@Override
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
index c0e97695bb..6c8b2a7c93 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
@@ -49,7 +49,8 @@ public class IoTDBCompactionIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(1);
EnvFactory.getEnv().initBeforeTest();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
index d96b3e2ccd..cd765dc565 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
@@ -53,7 +53,8 @@ public class IoTDBCompactionWithIDTableIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(1);
isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
originalDeviceIDTransformationMethod =
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
index e8390bf9cd..6c67563a5e 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
@@ -83,7 +83,7 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
@Before
public void setUp() throws Exception {
originalIsEnablePartition = config.isEnablePartition();
- originalPartitionInterval = config.getPartitionInterval();
+ originalPartitionInterval = config.getTimePartitionIntervalForStorage();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
index 1e2d5f2232..85833cf9f9 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
@@ -71,7 +71,8 @@ public class IoTDBMultiSeriesIT {
ConfigFactory.getConfig().setPageSizeInByte(1024 * 150);
ConfigFactory.getConfig().setGroupSizeInByte(1024 * 1000);
ConfigFactory.getConfig().setMemtableSizeThreshold(1024 * 1000);
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(100);
ConfigFactory.getConfig().setCompressor("LZ4");
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
index 4e9951451b..e9765d9ca5 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
@@ -88,8 +88,9 @@ public class IoTDBSeriesReaderIT {
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
// test result of IBatchReader should not cross partition
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(2);
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(2000);
EnvironmentUtils.envSetUp();
@@ -108,7 +109,9 @@ public class IoTDBSeriesReaderIT {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
+ IoTDBDescriptor.getInstance()
+ .getConfig()
+ .setTimePartitionIntervalForStorage(prevPartitionInterval);
}
private static void insertData() throws ClassNotFoundException {
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
index 4f8fbf5dae..0016f1ef3f 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
@@ -44,7 +44,8 @@ public class IoTDBTimePartitionIT {
@Before
public void setUp() throws Exception {
ConfigFactory.getConfig().setEnablePartition(true);
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(2592000);
EnvFactory.getEnv().initBeforeTest();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java
index 0109f88fd0..6d38a673c1 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUDFNestAggregationIT.java
@@ -136,7 +136,8 @@ public class IoTDBUDFNestAggregationIT {
@BeforeClass
public static void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(1000);
EnvFactory.getEnv().initBeforeClass();
prepareData();
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUserDefinedAggregationFunctionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUserDefinedAggregationFunctionIT.java
index 1bb70594f8..bbd3c2b3e8 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUserDefinedAggregationFunctionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aggregation/IoTDBUserDefinedAggregationFunctionIT.java
@@ -91,11 +91,11 @@ public class IoTDBUserDefinedAggregationFunctionIT {
private static final String insertTemplate =
"INSERT INTO root.vehicle.d0(timestamp,s0,s1,s2,s3,s4)" + " VALUES(%d,%d,%d,%f,%s,%s)";
private static long prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
@BeforeClass
public static void setUp() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(1000000);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -104,7 +104,9 @@ public class IoTDBUserDefinedAggregationFunctionIT {
@AfterClass
public static void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
+ IoTDBDescriptor.getInstance()
+ .getConfig()
+ .setTimePartitionIntervalForStorage(prevPartitionInterval);
}
// add test for part of points in page don't satisfy filter
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java
index a8ccec1825..61e204102e 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java
@@ -67,7 +67,8 @@ public class IoTDBGroupByFillQueryBigDataIT {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false);
ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false);
ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryIT.java
index d787ca1d43..cfd99ec5cc 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryIT.java
@@ -64,7 +64,8 @@ public class IoTDBGroupByFillQueryIT {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false);
ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false);
ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
index b4d5c33301..48ffd7a09f 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
@@ -51,7 +51,7 @@ public class StandaloneEnvConfig implements BaseConfig {
}
public BaseConfig setPartitionInterval(long partitionInterval) {
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(partitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(partitionInterval);
return this;
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillIT.java
index 48cefde6b1..5978fd77ec 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillIT.java
@@ -90,7 +90,7 @@ public class IoTDBGroupByFillIT {
@AfterClass
public static void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(86400);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(86400000);
EnvironmentUtils.cleanEnv();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillMixPathsIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillMixPathsIT.java
index fceb4e33b3..139bf085b2 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillMixPathsIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/groupby/IoTDBGroupByFillMixPathsIT.java
@@ -106,7 +106,7 @@ public class IoTDBGroupByFillMixPathsIT {
@AfterClass
public static void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(86400);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(86400000);
EnvironmentUtils.cleanEnv();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
index c1177dfd0d..6fea22169f 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
@@ -65,7 +65,8 @@ public class IoTDBDeletionVersionAdaptionIT {
@Before
public void setUp() throws Exception {
Locale.setDefault(Locale.ENGLISH);
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
ConfigFactory.getConfig().setPartitionInterval(1000);
EnvFactory.getEnv().initBeforeTest();
prepareSeries();
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 76b53f6db8..b5c1f9de49 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
@@ -758,12 +758,6 @@ public class IoTDBConfig {
/** whether enable data partition. If disabled, all data belongs to partition 0 */
private boolean enablePartition = false;
- /**
- * Time range for partitioning data inside each storage group, the unit is second. Default time is
- * a day.
- */
- private long partitionInterval = 86400;
-
/** Time partition interval for storage in milliseconds */
private long timePartitionIntervalForStorage = 86400000;
@@ -1112,14 +1106,6 @@ public class IoTDBConfig {
this.enablePartition = enablePartition;
}
- public long getPartitionInterval() {
- return partitionInterval;
- }
-
- public void setPartitionInterval(long partitionInterval) {
- this.partitionInterval = partitionInterval;
- }
-
public long getTimePartitionIntervalForStorage() {
return timePartitionIntervalForStorage;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 21889c5ae9..48f2dd605a 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -889,11 +889,6 @@ public class IoTDBDescriptor {
Boolean.parseBoolean(
properties.getProperty("enable_partition", String.valueOf(conf.isEnablePartition()))));
- conf.setPartitionInterval(
- Long.parseLong(
- properties.getProperty(
- "partition_interval", String.valueOf(conf.getPartitionInterval()))));
-
conf.setTimePartitionIntervalForStorage(
Long.parseLong(
properties.getProperty(
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
index fc190de029..c2336ac7fc 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
@@ -74,7 +74,7 @@ public class IoTDBStartCheck {
private static String timestampPrecision = config.getTimestampPrecision();
private static final String PARTITION_INTERVAL_STRING = "partition_interval";
- private static long partitionInterval = config.getPartitionInterval();
+ private static long partitionInterval = config.getTimePartitionIntervalForStorage();
private static final String TSFILE_FILE_SYSTEM_STRING = "tsfile_storage_fs";
private static String tsfileFileSystem = config.getTsFileStorageFs().toString();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index c99f87e247..08c3dc3b2c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -148,7 +148,7 @@ public class StorageEngine implements IService {
private static void initTimePartition() {
timePartitionInterval =
convertMilliWithPrecision(
- IoTDBDescriptor.getInstance().getConfig().getPartitionInterval() * 1000L);
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage());
}
public static long convertMilliWithPrecision(long milliTime) {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionSelectorTest.java
index 0946d0c7eb..4429dccc36 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionSelectorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionSelectorTest.java
@@ -33,8 +33,9 @@ import java.util.List;
public class SizeTieredCompactionSelectorTest {
@Test
public void testSubmitWhenNextTimePartitionExists() {
- long originPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
+ long originPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(1000000);
List<TsFileResource> resources = new ArrayList<>();
for (int i = 0; i < 100; ++i) {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/DataRegionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/DataRegionTest.java
index f8fbe1542a..6542a57286 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/DataRegionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/DataRegionTest.java
@@ -421,11 +421,11 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(100);
+ config.setTimePartitionIntervalForStorage(100000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -505,7 +505,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
@@ -514,11 +514,11 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(1200);
+ config.setTimePartitionIntervalForStorage(1200000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -598,7 +598,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
@@ -607,11 +607,11 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(1000);
+ config.setTimePartitionIntervalForStorage(1000000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -691,7 +691,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
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 7b78c33eba..faf2508aa1 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
@@ -385,11 +385,11 @@ public class StorageGroupProcessorTest {
public void testEnableDiscardOutOfOrderDataForInsertTablet1()
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(100);
+ config.setTimePartitionIntervalForStorage(100000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -463,7 +463,7 @@ public class StorageGroupProcessorTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
@@ -471,11 +471,11 @@ public class StorageGroupProcessorTest {
public void testEnableDiscardOutOfOrderDataForInsertTablet2()
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(1200);
+ config.setTimePartitionIntervalForStorage(1200000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -549,7 +549,7 @@ public class StorageGroupProcessorTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
@@ -557,11 +557,11 @@ public class StorageGroupProcessorTest {
public void testEnableDiscardOutOfOrderDataForInsertTablet3()
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getPartitionInterval();
+ long defaultTimePartition = config.getTimePartitionIntervalForStorage();
boolean defaultEnablePartition = config.isEnablePartition();
config.setEnableDiscardOutOfOrderData(true);
config.setEnablePartition(true);
- config.setPartitionInterval(1000);
+ config.setTimePartitionIntervalForStorage(1000000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -635,7 +635,7 @@ public class StorageGroupProcessorTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setPartitionInterval(defaultTimePartition);
+ config.setTimePartitionIntervalForStorage(defaultTimePartition);
config.setEnablePartition(defaultEnablePartition);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
index 6b1ddb33c3..229865a9df 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
@@ -88,8 +88,9 @@ public class TTLTest {
@Before
public void setUp() throws MetadataException, DataRegionException {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getPartitionInterval();
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(86400);
+ prevPartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(86400000);
EnvironmentUtils.envSetUp();
createSchemas();
}
@@ -98,7 +99,9 @@ public class TTLTest {
public void tearDown() throws IOException, StorageEngineException {
dataRegion.syncCloseAllWorkingTsFileProcessors();
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(prevPartitionInterval);
+ IoTDBDescriptor.getInstance()
+ .getConfig()
+ .setTimePartitionIntervalForStorage(prevPartitionInterval);
}
private void createSchemas() throws MetadataException, DataRegionException {
diff --git a/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java b/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
index d4538f59a5..d17bdd9da5 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
@@ -79,10 +79,10 @@ public class TsFileAndModSettleToolTest {
config = IoTDBDescriptor.getInstance().getConfig();
originEnablePartition = config.isEnablePartition();
- originPartitionInterval = config.getPartitionInterval();
+ originPartitionInterval = config.getTimePartitionIntervalForStorage();
config.setEnablePartition(newEnablePartition);
- config.setPartitionInterval(newPartitionInterval);
+ config.setTimePartitionIntervalForStorage(newPartitionInterval);
StorageEngine.setEnablePartition(newEnablePartition);
StorageEngine.setTimePartitionInterval(newPartitionInterval);
@@ -105,7 +105,7 @@ public class TsFileAndModSettleToolTest {
}
}
config.setEnablePartition(originEnablePartition);
- config.setPartitionInterval(originPartitionInterval);
+ config.setTimePartitionIntervalForStorage(originPartitionInterval);
StorageEngine.setEnablePartition(originEnablePartition);
StorageEngine.setTimePartitionInterval(originPartitionInterval);
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java b/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
index 61f77c766b..1b20132147 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
@@ -90,10 +90,10 @@ public class TsFileRewriteToolTest {
config = IoTDBDescriptor.getInstance().getConfig();
originEnablePartition = config.isEnablePartition();
- originPartitionInterval = config.getPartitionInterval();
+ originPartitionInterval = config.getTimePartitionIntervalForStorage();
config.setEnablePartition(newEnablePartition);
- config.setPartitionInterval(newPartitionInterval);
+ config.setTimePartitionIntervalForStorage(newPartitionInterval);
StorageEngine.setEnablePartition(newEnablePartition);
StorageEngine.setTimePartitionInterval(newPartitionInterval);
@@ -114,7 +114,7 @@ public class TsFileRewriteToolTest {
Assert.assertTrue(deleteSuccess);
}
config.setEnablePartition(originEnablePartition);
- config.setPartitionInterval(originPartitionInterval);
+ config.setTimePartitionIntervalForStorage(originPartitionInterval);
StorageEngine.setEnablePartition(originEnablePartition);
StorageEngine.setTimePartitionInterval(originPartitionInterval);