You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/17 07:20:29 UTC
[iotdb] branch master updated: [IOTDB-4954] remove enable_partition and time_partition_interval_for_storage (#8002)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 92c6a57f21 [IOTDB-4954] remove enable_partition and time_partition_interval_for_storage (#8002)
92c6a57f21 is described below
commit 92c6a57f2143e9be189c3ea08c8af0ec645eec9f
Author: Mrquan <50...@users.noreply.github.com>
AuthorDate: Thu Nov 17 15:20:23 2022 +0800
[IOTDB-4954] remove enable_partition and time_partition_interval_for_storage (#8002)
---
.../confignode/conf/ConfigNodeDescriptor.java | 3 +-
.../iotdb/confignode/manager/ConfigManager.java | 3 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 15 ++--------
.../Reference/ConfigNode-Config-Manual.md | 8 ++---
docs/UserGuide/Reference/DataNode-Config-Manual.md | 20 -------------
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 25 +++++-----------
.../Reference/ConfigNode-Config-Manual.md | 4 +--
.../UserGuide/Reference/DataNode-Config-Manual.md | 18 ------------
.../java/org/apache/iotdb/it/env/MppConfig.java | 20 ++-----------
.../org/apache/iotdb/itbase/env/BaseConfig.java | 14 +--------
.../confignode/it/IoTDBClusterPartitionIT.java | 4 +--
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 4 +--
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 4 +--
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 12 ++------
.../iotdb/db/it/env/StandaloneEnvConfig.java | 15 ++--------
.../iotdb/session/it/IoTDBSessionComplexIT.java | 19 +++++-------
.../iotdb/integration/env/ClusterEnvConfig.java | 8 +----
.../org/apache/iotdb/itbase/env/BaseConfig.java | 4 ---
.../iotdb/db/integration/IoTDBCompactionIT.java | 3 +-
.../integration/IoTDBCompactionWithIDTableIT.java | 3 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 3 +-
.../db/integration/IoTDBRemovePartitionIT.java | 2 --
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 9 ++----
.../iotdb/db/integration/IoTDBTimePartitionIT.java | 5 +---
.../aggregation/IoTDBUDFNestAggregationIT.java | 3 +-
.../IoTDBUserDefinedAggregationFunctionIT.java | 8 ++---
.../aligned/IoTDBGroupByFillQueryBigDataIT.java | 3 +-
.../aligned/IoTDBGroupByFillQueryIT.java | 3 +-
.../db/integration/env/StandaloneEnvConfig.java | 7 +----
.../db/integration/groupby/IoTDBGroupByFillIT.java | 2 +-
.../groupby/IoTDBGroupByFillMixPathsIT.java | 2 +-
.../IoTDBDeletionVersionAdaptionIT.java | 3 +-
.../resources/conf/iotdb-common.properties | 12 ++------
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 34 ++++------------------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 20 ++-----------
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 30 ++-----------------
.../apache/iotdb/db/engine/StorageEngineV2.java | 34 +++++-----------------
.../iotdb/db/engine/load/AlignedChunkData.java | 6 ++--
.../iotdb/db/engine/load/NonAlignedChunkData.java | 4 +--
.../iotdb/db/engine/load/TsFileSplitter.java | 22 +++++++-------
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 4 +--
.../plan/node/load/LoadSingleTsFileNode.java | 4 +--
.../planner/plan/node/write/InsertRowNode.java | 4 +--
.../planner/plan/node/write/InsertRowsNode.java | 2 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 2 +-
.../planner/plan/node/write/InsertTabletNode.java | 28 +++++++++---------
.../crud/InsertMultiTabletsStatement.java | 2 +-
.../plan/statement/crud/InsertRowStatement.java | 4 +--
.../crud/InsertRowsOfOneDeviceStatement.java | 3 +-
.../plan/statement/crud/InsertRowsStatement.java | 2 +-
.../plan/statement/crud/InsertTabletStatement.java | 17 +++++------
.../apache/iotdb/db/utils/TimePartitionUtils.java | 16 +++++-----
.../SizeTieredCompactionSelectorTest.java | 4 +--
.../db/engine/storagegroup/DataRegionTest.java | 27 ++++++-----------
.../iotdb/db/engine/storagegroup/TTLTest.java | 9 ++----
.../plan/node/write/WritePlanNodeSplitTest.java | 18 +++++-------
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 7 -----
.../iotdb/db/utils/TsFileRewriteToolTest.java | 12 +++-----
58 files changed, 166 insertions(+), 417 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 6240d499b5..976f0e3710 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -265,8 +265,7 @@ public class ConfigNodeDescriptor {
Long.parseLong(
properties
.getProperty(
- "time_partition_interval_for_routing",
- String.valueOf(conf.getTimePartitionInterval()))
+ "time_partition_interval", String.valueOf(conf.getTimePartitionInterval()))
.trim()));
conf.setSchemaReplicationFactor(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 91893e5c48..393376afd7 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -758,8 +758,7 @@ public class ConfigManager implements IManager {
return errorStatus.setMessage(errorPrefix + "default_ttl" + errorSuffix);
}
if (req.getTimePartitionInterval() != conf.getTimePartitionInterval()) {
- return errorStatus.setMessage(
- errorPrefix + "time_partition_interval_for_routing" + errorSuffix);
+ return errorStatus.setMessage(errorPrefix + "time_partition_interval" + errorSuffix);
}
if (req.getSchemaReplicationFactor() != conf.getSchemaReplicationFactor()) {
return errorStatus.setMessage(errorPrefix + "schema_replication_factor" + errorSuffix);
diff --git a/docs/UserGuide/Data-Concept/Time-Partition.md b/docs/UserGuide/Data-Concept/Time-Partition.md
index 519450e319..ddd781d4b3 100644
--- a/docs/UserGuide/Data-Concept/Time-Partition.md
+++ b/docs/UserGuide/Data-Concept/Time-Partition.md
@@ -25,19 +25,10 @@
Time partition divides data according to time, and a time partition is used to save all data within a certain time range. The time partition number is represented by a natural number. Number 0 means January 1, 1970, it will increase by one every partition_interval milliseconds. Time partition number's calculation formula is timestamp / partition_interval. The main configuration items are as follows:
-* enable\_partition
+* time\_partition\_interval
-|Name| enable\_partition |
-|:---:|:---|
-|Description| Whether enable time partition for data, if disabled, all data belongs to partition 0 (It's not recommend to open this function. If open, please calculate appropriate concurrent_writing_time_partition and wal_buffer_size)|
-|Type|Bool|
-|Default| false |
-|Effective|Only allowed to be modified in first start up|
-
-* time\_partition\_interval\_for\_storage
-
-|Name| time\_partition\_interval\_for\_storage |
-|:---:|:-------------------------------------------------------------------------------------------------------|
+|Name| time\_partition\_interval |
+ |:---:|:-------------------------------------------------------------------------------------------------------|
|Description| Time range for dividing database, time series data will be divided into groups by this time range |
|Type| Int64 |
|Default| 604800000 |
diff --git a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
index 4eff42d69c..999c68e77f 100644
--- a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
+++ b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
@@ -244,14 +244,14 @@ The global configuration of cluster is in ConfigNode.
|Default| Infinity |
|Effective|After restarting system|
-* time\_partition\_interval\_for\_routing
+* time\_partition\_interval
-|Name| time\_partition\_interval\_for\_routing |
+|Name| time\_partition\_interval |
|:---:|:--------------------------------------------------------------|
|Description| Time partition interval of data when ConfigNode allocate data |
|Type| Long |
-|Unit| ms |
-|Default| 604800000 |
+|Unit| ms |
+|Default| 604800000 |
|Effective| Only allowed to be modified in first start up |
diff --git a/docs/UserGuide/Reference/DataNode-Config-Manual.md b/docs/UserGuide/Reference/DataNode-Config-Manual.md
index 9a287522e2..303db9b5ab 100644
--- a/docs/UserGuide/Reference/DataNode-Config-Manual.md
+++ b/docs/UserGuide/Reference/DataNode-Config-Manual.md
@@ -541,26 +541,6 @@ The permission definitions are in ${IOTDB\_CONF}/conf/jmx.access.
|Default| 536870912 |
|Effective| After restarting system |
-* enable\_partition
-
-|Name| enable\_partition |
-|:---:|:---|
-|Description| Whether enable time partition for data, if disabled, all data belongs to partition 0 (it's not recommend to open this function. If open, please calculate appropriate concurrent_writing_time_partition and wal_buffer_size)|
-|Type|Bool|
-|Default| false |
-|Effective|Only allowed to be modified in first start up|
-
-* time\_partition\_interval\_for\_storage
-
-|Name| time\_partition\_interval\_for\_storage |
-|:---:|:-------------------------------------------------------------------------------------------------------|
-|Description| Time range for dividing database, time series data will be divided into groups by this time range |
-|Type| Int64 |
-|Unit| ms |
-|Default| 604800000 |
-|Effective| Only allowed to be modified in first start up |
-
-
* concurrent\_writing\_time\_partition
|Name| concurrent\_writing\_time\_partition |
diff --git a/docs/zh/UserGuide/Data-Concept/Time-Partition.md b/docs/zh/UserGuide/Data-Concept/Time-Partition.md
index 8b3afab390..b2f65b06bf 100644
--- a/docs/zh/UserGuide/Data-Concept/Time-Partition.md
+++ b/docs/zh/UserGuide/Data-Concept/Time-Partition.md
@@ -25,23 +25,14 @@
时间分区按照时间分割数据，一个时间分区用于保存某个时间范围内的所有数据。时间分区编号使用自然数表示，0 表示 1970 年 1 月 1 日，每隔 partition_interval 毫秒后加一。数据通过计算 timestamp / partition_interval 得到自己所在的时间分区编号，主要配置项如下所示：
-* enable\_partition
-
-|名字| enable\_partition |
-|:---:|:---|
-|描述| 是否开启将数据按时间分区存储的功能，如果关闭，所有数据都属于分区 0 (不建议开启此功能。 如果打开，请计算合适的 concurrent_writing_time_partition 和 wal_buffer_size)|
-|类型|Bool|
-|默认值| false |
-|改后生效方式|仅允许在第一次启动服务前修改|
-
-* time\_partition\_interval\_for\_storage
-
-|名字| time\_partition\_interval\_for\_storage |
-|:---:|:----------------------------------------|
-|描述| Database 分区的时间段长度，用户指定的 database 下会使用该时间段进行分区，单位：毫秒 |
-|类型| Int64 |
-|默认值| 604800000 |
-|改后生效方式| 仅允许在第一次启动服务前修改 |
+* time\_partition\_interval
+
+|名字| time\_partition\_interval |
+ |:---------------------------------------------------:|:----------------------------------------|
+|描述| Database 分区的时间段长度，用户指定的 database 下会使用该时间段进行分区，单位：毫秒 |
+|类型| Int64 |
+|默认值| 604800000 |
+|改后生效方式| 仅允许在第一次启动服务前修改 |
## 配置示例
diff --git a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
index a8270c07ce..5b3133546f 100644
--- a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
@@ -239,9 +239,9 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。
|默认值| 无限 |
|改后生效方式|重启服务生效|
-* time\_partition\_interval\_for\_routing
+* time\_partition\_interval
-|名字| time\_partition\_interval\_for\_routing |
+|名字| time\_partition\_interval |
|:--:|:----------------------------------------|
|描述| Database 默认的数据时间分区间隔 |
|类型| Long |
diff --git a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
index 4c531c07e8..f5f53efcd1 100644
--- a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
@@ -1647,24 +1647,6 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB
|默认值| 134217728 |
|改后生效方式|重启服务生效|
-* enable\_partition
-
-|名字| enable\_partition |
-|:---:|:---|
-|描述| 是否开启将数据按时间分区存储的功能，如果关闭，所有数据都属于分区 0 (不建议开启此功能。 如果打开，请计算合适的 concurrent_writing_time_partition 和 wal_buffer_size)|
-|类型| Boolean |
-|默认值| false |
-|改后生效方式|仅允许在第一次启动服务前修改|
-
-* time\_partition\_interval\_for\_storage
-
-|名字| time\_partition\_interval\_for\_storage |
-|:---:|:-----------------------------------------|
-|描述| 用于 database 分区的时间段长度，用户指定的 database 下会使用该时间段进行分区，单位：毫秒 |
-|类型| Int64 |
-|默认值| 604800000 |
-|改后生效方式| 仅允许在第一次启动服务前修改 |
-
* data\_region\_num
| 名字 | data\_region\_num |
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
index 7f419b0f41..bff891fef8 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
@@ -80,15 +80,7 @@ public class MppConfig implements BaseConfig {
@Override
public BaseConfig setPartitionInterval(long partitionInterval) {
- engineProperties.setProperty(
- "time_partition_interval_for_storage", String.valueOf(partitionInterval));
- return this;
- }
-
- @Override
- public BaseConfig setTimePartitionIntervalForStorage(long partitionInterval) {
- engineProperties.setProperty(
- "time_partition_interval_for_storage", String.valueOf(partitionInterval));
+ engineProperties.setProperty("time_partition_interval", String.valueOf(partitionInterval));
return this;
}
@@ -119,12 +111,6 @@ public class MppConfig implements BaseConfig {
return this;
}
- @Override
- public BaseConfig setEnablePartition(boolean enablePartition) {
- engineProperties.setProperty("enable_partition", String.valueOf(enablePartition));
- return this;
- }
-
@Override
public BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
// udf_memory_budget_in_mb
@@ -250,9 +236,9 @@ public class MppConfig implements BaseConfig {
}
@Override
- public BaseConfig setTimePartitionIntervalForRouting(long timePartitionInterval) {
+ public BaseConfig setTimePartitionInterval(long timePartitionInterval) {
confignodeProperties.setProperty(
- "time_partition_interval_for_routing", String.valueOf(timePartitionInterval));
+ "time_partition_interval", String.valueOf(timePartitionInterval));
return this;
}
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
index 4c5fc1187c..2f6fbcea9f 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
@@ -70,18 +70,10 @@ public interface BaseConfig {
return this;
}
- default boolean isEnablePartition() {
- return false;
- }
-
default BaseConfig setPartitionInterval(long partitionInterval) {
return this;
}
- default BaseConfig setTimePartitionIntervalForStorage(long partitionInterval) {
- return this;
- }
-
default long getPartitionInterval() {
return 604800;
}
@@ -102,10 +94,6 @@ public interface BaseConfig {
return this;
}
- default BaseConfig setEnablePartition(boolean enablePartition) {
- return this;
- }
-
default BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
return this;
}
@@ -251,7 +239,7 @@ public interface BaseConfig {
return 1;
}
- default BaseConfig setTimePartitionIntervalForRouting(long timePartitionInterval) {
+ default BaseConfig setTimePartitionInterval(long timePartitionInterval) {
return this;
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java
index 0ba9a9dcd1..05985a3e2f 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterPartitionIT.java
@@ -114,7 +114,7 @@ public class IoTDBClusterPartitionIT {
ConfigFactory.getConfig().setDataReplicationFactor(testReplicationFactor);
originalTimePartitionInterval = ConfigFactory.getConfig().getTimePartitionInterval();
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(testTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(testTimePartitionInterval);
EnvFactory.getEnv().initBeforeClass();
}
@@ -133,7 +133,7 @@ public class IoTDBClusterPartitionIT {
ConfigFactory.getConfig().setSchemaReplicationFactor(originalSchemaReplicationFactor);
ConfigFactory.getConfig().setDataReplicationFactor(originalDataReplicationFactor);
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(originalTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(originalTimePartitionInterval);
}
@Test
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterRestartIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterRestartIT.java
index dbdecb01de..2510e81e2a 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterRestartIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBClusterRestartIT.java
@@ -99,7 +99,7 @@ public class IoTDBClusterRestartIT {
ConfigFactory.getConfig().setDataReplicationFactor(testReplicationFactor);
originalTimePartitionInterval = ConfigFactory.getConfig().getTimePartitionInterval();
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(testTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(testTimePartitionInterval);
// Init 3C3D cluster environment
EnvFactory.getEnv().initClusterEnvironment(testConfigNodeNum, testDataNodeNum);
}
@@ -113,7 +113,7 @@ public class IoTDBClusterRestartIT {
.setSchemaRegionConsensusProtocolClass(originalSchemaRegionConsensusProtocolClass);
ConfigFactory.getConfig()
.setDataRegionConsensusProtocolClass(originalDataRegionConsensusProtocolClass);
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(originalTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(originalTimePartitionInterval);
}
@Test
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
index df2f269ffd..70d8c34c52 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java
@@ -98,7 +98,7 @@ public class IoTDBConfigNodeSnapshotIT {
ConfigFactory.getConfig().setRatisSnapshotTriggerThreshold(testRatisSnapshotTriggerThreshold);
originalTimePartitionInterval = ConfigFactory.getConfig().getTimePartitionInterval();
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(testTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(testTimePartitionInterval);
// Init 2C2D cluster environment
EnvFactory.getEnv().initClusterEnvironment(2, 2);
@@ -112,7 +112,7 @@ public class IoTDBConfigNodeSnapshotIT {
.setConfigNodeConsesusProtocolClass(originalConfigNodeConsensusProtocolClass);
ConfigFactory.getConfig()
.setRatisSnapshotTriggerThreshold(originalRatisSnapshotTriggerThreshold);
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(originalTimePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(originalTimePartitionInterval);
}
@Test
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
index 96a8749f31..2a2639ae2c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java
@@ -57,8 +57,6 @@ public class IOTDBLoadTsFileIT {
private static final Logger LOGGER = LoggerFactory.getLogger(IOTDBLoadTsFileIT.class);
private static final long PARTITION_INTERVAL = 10 * 1000L;
- private boolean originEnablePartition;
- private long originPartitionInterval;
private long originConfigNodePartitionInterval;
private File tmpDir;
@@ -66,12 +64,8 @@ public class IOTDBLoadTsFileIT {
@Before
public void setUp() throws Exception {
tmpDir = new File(Files.createTempDirectory("load").toUri());
- originEnablePartition = ConfigFactory.getConfig().isEnablePartition();
- originPartitionInterval = ConfigFactory.getConfig().getPartitionInterval();
originConfigNodePartitionInterval = ConfigFactory.getConfig().getTimePartitionInterval();
- ConfigFactory.getConfig().setEnablePartition(true);
- ConfigFactory.getConfig().setTimePartitionIntervalForStorage(PARTITION_INTERVAL);
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(PARTITION_INTERVAL);
+ ConfigFactory.getConfig().setTimePartitionInterval(PARTITION_INTERVAL);
EnvFactory.getEnv().initBeforeTest();
}
@@ -80,9 +74,7 @@ public class IOTDBLoadTsFileIT {
deleteSG();
EnvFactory.getEnv().cleanAfterTest();
- ConfigFactory.getConfig().setEnablePartition(originEnablePartition);
- ConfigFactory.getConfig().setTimePartitionIntervalForStorage(originPartitionInterval);
- ConfigFactory.getConfig().setTimePartitionIntervalForRouting(originConfigNodePartitionInterval);
+ ConfigFactory.getConfig().setTimePartitionInterval(originConfigNodePartitionInterval);
if (!deleteDir()) {
LOGGER.error("Can not delete tmp dir for loading tsfile.");
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 a90d7d0734..32291cb01c 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
@@ -60,20 +60,15 @@ public class StandaloneEnvConfig implements BaseConfig {
return this;
}
- @Override
- public boolean isEnablePartition() {
- return IoTDBDescriptor.getInstance().getConfig().isEnablePartition();
- }
-
@Override
public BaseConfig setPartitionInterval(long partitionInterval) {
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(partitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(partitionInterval);
return this;
}
@Override
public long getPartitionInterval() {
- return IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ return IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
}
@Override
@@ -106,12 +101,6 @@ public class StandaloneEnvConfig implements BaseConfig {
return this;
}
- @Override
- public BaseConfig setEnablePartition(boolean enablePartition) {
- IoTDBDescriptor.getInstance().getConfig().setEnablePartition(enablePartition);
- return this;
- }
-
@Override
public BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
IoTDBDescriptor.getInstance()
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
index e752befc39..0fb1a8e2d2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
@@ -272,8 +272,7 @@ public class IoTDBSessionComplexIT {
private void insertRecords(ISession session, List<String> deviceIdList)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartitionForRouting =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForRouting();
+ long timePartition = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
List<String> measurements = new ArrayList<>();
measurements.add("s1");
@@ -285,7 +284,7 @@ public class IoTDBSessionComplexIT {
List<Long> timestamps = new ArrayList<>();
List<List<TSDataType>> typesList = new ArrayList<>();
- for (long time = 0; time < 10 * timePartitionForRouting; time += timePartitionForRouting / 10) {
+ for (long time = 0; time < 10 * timePartition; time += timePartition / 10) {
List<Object> values = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
values.add(1L);
@@ -307,7 +306,7 @@ public class IoTDBSessionComplexIT {
timestamps.add(time);
timestamps.add(time);
- if (time != 0 && time % (5 * timePartitionForRouting) == 0) {
+ if (time != 0 && time % (5 * timePartition) == 0) {
session.insertRecords(deviceIds, timestamps, measurementsList, typesList, valuesList);
deviceIds.clear();
measurementsList.clear();
@@ -322,8 +321,7 @@ public class IoTDBSessionComplexIT {
private void insertMultiTablets(ISession session, List<String> deviceIdList)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartitionForRouting =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForRouting();
+ long timePartition = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
List<MeasurementSchema> schemaList = new ArrayList<>();
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
@@ -334,7 +332,7 @@ public class IoTDBSessionComplexIT {
tabletMap.put(device, new Tablet(device, schemaList, 100));
}
- for (long time = 0; time < 10 * timePartitionForRouting; time += timePartitionForRouting / 10) {
+ for (long time = 0; time < 10 * timePartition; time += timePartition / 10) {
for (Tablet tablet : tabletMap.values()) {
long value = 0;
tablet.addTimestamp(tablet.rowSize, time);
@@ -351,8 +349,7 @@ public class IoTDBSessionComplexIT {
private void insertRecordsOfOneDevice(ISession session, String deviceId)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartitionForRouting =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForRouting();
+ long timePartition = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
List<String> measurements = new ArrayList<>();
measurements.add("s1");
@@ -363,7 +360,7 @@ public class IoTDBSessionComplexIT {
List<Long> timestamps = new ArrayList<>();
List<List<TSDataType>> typesList = new ArrayList<>();
- for (long time = 0; time < 10 * timePartitionForRouting; time += timePartitionForRouting / 10) {
+ for (long time = 0; time < 10 * timePartition; time += timePartition / 10) {
List<Object> values = new ArrayList<>();
List<TSDataType> types = new ArrayList<>();
values.add(1L);
@@ -378,7 +375,7 @@ public class IoTDBSessionComplexIT {
typesList.add(types);
timestamps.add(time);
- if (time != 0 && time % (5 * timePartitionForRouting) == 0) {
+ if (time != 0 && time % (5 * timePartition) == 0) {
session.insertRecordsOfOneDevice(
deviceId, timestamps, measurementsList, typesList, valuesList);
measurementsList.clear();
diff --git a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterEnvConfig.java b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterEnvConfig.java
index a140eb0798..21aebb1651 100644
--- a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterEnvConfig.java
+++ b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterEnvConfig.java
@@ -71,8 +71,7 @@ public class ClusterEnvConfig implements BaseConfig {
}
public BaseConfig setPartitionInterval(long partitionInterval) {
- engineProperties.setProperty(
- "time_partition_interval_for_storage", String.valueOf(partitionInterval));
+ engineProperties.setProperty("time_partition_interval", String.valueOf(partitionInterval));
return this;
}
@@ -99,11 +98,6 @@ public class ClusterEnvConfig implements BaseConfig {
return this;
}
- public BaseConfig setEnablePartition(boolean enablePartition) {
- engineProperties.setProperty("enable_partition", String.valueOf(enablePartition));
- return this;
- }
-
public BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
// udf_memory_budget_in_mb
// udf_reader_transformer_collector_memory_proportion
diff --git a/integration/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java b/integration/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
index 1fd81d1775..76d227d8c1 100644
--- a/integration/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
+++ b/integration/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
@@ -74,10 +74,6 @@ public interface BaseConfig {
return this;
}
- default BaseConfig setEnablePartition(boolean enablePartition) {
- return this;
- }
-
default BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
return this;
}
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 dce4ef7550..c56687bace 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,8 +49,7 @@ public class IoTDBCompactionIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
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 de44842958..652aa353b0 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,8 +53,7 @@ public class IoTDBCompactionWithIDTableIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(1);
isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
originalDeviceIDTransformationMethod =
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 8228d7953e..68d76e6402 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,8 +71,7 @@ public class IoTDBMultiSeriesIT {
ConfigFactory.getConfig().setPageSizeInByte(1024 * 150);
ConfigFactory.getConfig().setGroupSizeInByte(1024 * 1000);
ConfigFactory.getConfig().setMemtableSizeThreshold(1024 * 1000);
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(100);
ConfigFactory.getConfig().setCompressor("LZ4");
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
index 9a0a11b1d7..64de70ee2b 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
@@ -54,14 +54,12 @@ package org.apache.iotdb.db.integration;
// @Before
// public void setUp() throws Exception {
// EnvironmentUtils.envSetUp();
-//// StorageEngine.setEnablePartition(true);
//// StorageEngine.setTimePartitionInterval(partitionInterval);
// insertData();
// }
//
// @After
// public void tearDown() throws Exception {
-//// StorageEngine.setEnablePartition(false);
//// StorageEngine.setTimePartitionInterval(-1);
// EnvironmentUtils.cleanEnv();
// }
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 e9765d9ca5..c45a549776 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,9 +88,8 @@ public class IoTDBSeriesReaderIT {
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
// test result of IBatchReader should not cross partition
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(2000);
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(2000);
EnvironmentUtils.envSetUp();
@@ -109,9 +108,7 @@ public class IoTDBSeriesReaderIT {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setTimePartitionIntervalForStorage(prevPartitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(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 0016f1ef3f..57a85927ba 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
@@ -43,9 +43,7 @@ public class IoTDBTimePartitionIT {
@Before
public void setUp() throws Exception {
- ConfigFactory.getConfig().setEnablePartition(true);
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(2592000);
EnvFactory.getEnv().initBeforeTest();
}
@@ -54,7 +52,6 @@ public class IoTDBTimePartitionIT {
public void tearDown() throws Exception {
EnvFactory.getEnv().cleanAfterTest();
ConfigFactory.getConfig().setPartitionInterval(prevPartitionInterval);
- ConfigFactory.getConfig().setEnablePartition(false);
}
@Test
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 60d98dbec8..075fe5a5c8 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,8 +136,7 @@ public class IoTDBUDFNestAggregationIT {
@BeforeClass
public static void setUp() throws Exception {
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
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 dd98564996..39b0faec33 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().getTimePartitionIntervalForStorage();
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
@BeforeClass
public static void setUp() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(1000000);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(1000000);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData();
@@ -104,9 +104,7 @@ public class IoTDBUserDefinedAggregationFunctionIT {
@AfterClass
public static void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setTimePartitionIntervalForStorage(prevPartitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(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 292aad443c..531800c53c 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,8 +67,7 @@ public class IoTDBGroupByFillQueryBigDataIT {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
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 cfd99ec5cc..67b375d81f 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,8 +64,7 @@ public class IoTDBGroupByFillQueryIT {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
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 48ffd7a09f..90d332da51 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().setTimePartitionIntervalForStorage(partitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(partitionInterval);
return this;
}
@@ -81,11 +81,6 @@ public class StandaloneEnvConfig implements BaseConfig {
return this;
}
- public BaseConfig setEnablePartition(boolean enablePartition) {
- IoTDBDescriptor.getInstance().getConfig().setEnablePartition(enablePartition);
- return this;
- }
-
public BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
IoTDBDescriptor.getInstance()
.getConfig()
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 4f8dd7076c..a5afbaa37b 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().setTimePartitionIntervalForStorage(86400000);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(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 37d0638083..48aa353cae 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().setTimePartitionIntervalForStorage(86400000);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(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 8a0f966204..69b027b20c 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,8 +65,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Before
public void setUp() throws Exception {
Locale.setDefault(Locale.ENGLISH);
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(1000);
EnvFactory.getEnv().initBeforeTest();
prepareSeries();
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 75494626de..1d12434b22 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -109,10 +109,10 @@
### Cluster management
####################
-# Time partition interval in milliseconds, default is equal to one week
+# Time partition interval in milliseconds, and partitioning data inside each data region, default is equal to one week
# Can not be changed after the first start
# Datatype: long
-# time_partition_interval_for_routing=604800000
+# time_partition_interval=604800000
# The heartbeat interval in milliseconds, default is 1000ms
# Datatype: long
@@ -404,14 +404,6 @@
# Datatype: boolean
# enable_discard_out_of_order_data=false
-# whether enable data partition. If disabled, all data belongs to partition 0
-# Datatype: boolean
-# enable_partition=true
-
-# time range for partitioning data inside each data region, the unit is millisecond, default is equal to one week
-# Datatype: long
-# time_partition_interval_for_storage=604800000
-
# What will the system do when unrecoverable error occurs.
# Datatype: String
# Optional strategies are as follows:
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 cbd45c0459..007dc61660 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
@@ -743,14 +743,8 @@ public class IoTDBConfig {
/** The default value of primitive array size in array pool */
private int primitiveArraySize = 32;
- /** whether enable data partition. If disabled, all data belongs to partition 0 */
- private boolean enablePartition = true;
-
- /** Time partition interval for storage in milliseconds */
- private long timePartitionIntervalForStorage = 604_800_000;
-
- /** Time partition interval for routing in milliseconds */
- private long timePartitionIntervalForRouting = 604_800_000;
+ /** Time partition interval in milliseconds */
+ private long timePartitionInterval = 604_800_000;
/**
* Level of TimeIndex, which records the start time and end time of TsFileResource. Currently,
@@ -1122,28 +1116,12 @@ public class IoTDBConfig {
this.defaultFillInterval = defaultFillInterval;
}
- public boolean isEnablePartition() {
- return enablePartition;
- }
-
- public void setEnablePartition(boolean enablePartition) {
- this.enablePartition = enablePartition;
- }
-
- public long getTimePartitionIntervalForStorage() {
- return timePartitionIntervalForStorage;
- }
-
- public void setTimePartitionIntervalForStorage(long timePartitionIntervalForStorage) {
- this.timePartitionIntervalForStorage = timePartitionIntervalForStorage;
- }
-
- public long getTimePartitionIntervalForRouting() {
- return timePartitionIntervalForRouting;
+ public long getTimePartitionInterval() {
+ return timePartitionInterval;
}
- public void setTimePartitionIntervalForRouting(long timePartitionIntervalForRouting) {
- this.timePartitionIntervalForRouting = timePartitionIntervalForRouting;
+ public void setTimePartitionInterval(long timePartitionInterval) {
+ this.timePartitionInterval = timePartitionInterval;
}
public TimeIndexLevel getTimeIndexLevel() {
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 186815d5c6..dfd82a5ee0 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
@@ -886,16 +886,6 @@ public class IoTDBDescriptor {
// mqtt
loadMqttProps(properties);
- conf.setEnablePartition(
- Boolean.parseBoolean(
- properties.getProperty("enable_partition", String.valueOf(conf.isEnablePartition()))));
-
- conf.setTimePartitionIntervalForStorage(
- Long.parseLong(
- properties.getProperty(
- "time_partition_interval_for_storage",
- String.valueOf(conf.getTimePartitionIntervalForStorage()))));
-
conf.setSelectIntoInsertTabletPlanRowLimit(
Integer.parseInt(
properties.getProperty(
@@ -1011,13 +1001,9 @@ public class IoTDBDescriptor {
// author cache
loadAuthorCache(properties);
- conf.setTimePartitionIntervalForStorage(
+ conf.setTimePartitionInterval(
DateTimeUtils.convertMilliTimeWithPrecision(
- conf.getTimePartitionIntervalForStorage(), conf.getTimestampPrecision()));
-
- if (!conf.isClusterMode()) {
- conf.setTimePartitionIntervalForRouting(conf.getTimePartitionIntervalForStorage());
- }
+ conf.getTimePartitionInterval(), conf.getTimestampPrecision()));
}
private void loadAuthorCache(Properties properties) {
@@ -1941,7 +1927,7 @@ public class IoTDBDescriptor {
public void loadGlobalConfig(TGlobalConfig globalConfig) {
conf.setSeriesPartitionExecutorClass(globalConfig.getSeriesPartitionExecutorClass());
conf.setSeriesPartitionSlotNum(globalConfig.getSeriesPartitionSlotNum());
- conf.setTimePartitionIntervalForRouting(
+ conf.setTimePartitionInterval(
DateTimeUtils.convertMilliTimeWithPrecision(
globalConfig.timePartitionInterval, conf.getTimestampPrecision()));
conf.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel());
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 b2eb681a2a..7b6d031a23 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
@@ -77,15 +77,12 @@ public class IoTDBStartCheck {
private static final String TIMESTAMP_PRECISION_STRING = "timestamp_precision";
private static String timestampPrecision = config.getTimestampPrecision();
- private static final String PARTITION_INTERVAL_STRING = "time_partition_interval_for_storage";
- private static long timePartitionIntervalForStorage = config.getTimePartitionIntervalForStorage();
+ private static final String PARTITION_INTERVAL_STRING = "time_partition_interval";
+ private static long timePartitionInterval = config.getTimePartitionInterval();
private static final String TSFILE_FILE_SYSTEM_STRING = "tsfile_storage_fs";
private static String tsfileFileSystem = config.getTsFileStorageFs().toString();
- private static final String ENABLE_PARTITION_STRING = "enable_partition";
- private static boolean enablePartition = config.isEnablePartition();
-
private static final String TAG_ATTRIBUTE_SIZE_STRING = "tag_attribute_total_size";
private static String tagAttributeTotalSize = String.valueOf(config.getTagAttributeTotalSize());
@@ -180,22 +177,10 @@ public class IoTDBStartCheck {
System.exit(-1);
}
- if (!enablePartition) {
- timePartitionIntervalForStorage = Long.MAX_VALUE;
- }
-
- // check partition interval
- if (timePartitionIntervalForStorage <= 0) {
- logger.error("Partition interval must larger than 0!");
- System.exit(-1);
- }
-
systemProperties.put(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
systemProperties.put(TIMESTAMP_PRECISION_STRING, timestampPrecision);
- systemProperties.put(
- PARTITION_INTERVAL_STRING, String.valueOf(timePartitionIntervalForStorage));
+ systemProperties.put(PARTITION_INTERVAL_STRING, String.valueOf(timePartitionInterval));
systemProperties.put(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
- systemProperties.put(ENABLE_PARTITION_STRING, String.valueOf(enablePartition));
systemProperties.put(TAG_ATTRIBUTE_SIZE_STRING, tagAttributeTotalSize);
systemProperties.put(TAG_ATTRIBUTE_FLUSH_INTERVAL, tagAttributeFlushInterval);
systemProperties.put(MAX_DEGREE_OF_INDEX_STRING, maxDegreeOfIndexNode);
@@ -407,15 +392,6 @@ public class IoTDBStartCheck {
throwException(TIMESTAMP_PRECISION_STRING, timestampPrecision);
}
- if (Boolean.parseBoolean(properties.getProperty(ENABLE_PARTITION_STRING)) != enablePartition) {
- throwException(ENABLE_PARTITION_STRING, enablePartition);
- }
-
- if (Long.parseLong(properties.getProperty(PARTITION_INTERVAL_STRING))
- != timePartitionIntervalForStorage) {
- throwException(PARTITION_INTERVAL_STRING, timePartitionIntervalForStorage);
- }
-
if (!(properties.getProperty(TSFILE_FILE_SYSTEM_STRING).equals(tsfileFileSystem))) {
throwException(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
index ac4492cbc4..7702583de7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java
@@ -34,7 +34,6 @@ import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.conf.ServerConfigConsistent;
import org.apache.iotdb.db.consensus.statemachine.visitor.DataExecutionVisitor;
import org.apache.iotdb.db.engine.flush.CloseFileListener;
import org.apache.iotdb.db.engine.flush.FlushListener;
@@ -100,9 +99,7 @@ public class StorageEngineV2 implements IService {
private static final long TTL_CHECK_INTERVAL = 60 * 1000L;
/** Time range for dividing database, the time unit is the same with IoTDB's TimestampPrecision */
- private static long timePartitionIntervalForStorage = -1;
- /** whether enable data partition if disabled, all data belongs to partition 0 */
- @ServerConfigConsistent private static boolean enablePartition = config.isEnablePartition();
+ private static long timePartitionInterval = -1;
/**
* a folder (system/databases/ by default) that persist system info. Each database will have a
@@ -148,31 +145,21 @@ public class StorageEngineV2 implements IService {
}
private static void initTimePartition() {
- timePartitionIntervalForStorage =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
+ timePartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
}
- public static long getTimePartitionIntervalForStorage() {
- if (timePartitionIntervalForStorage == -1) {
+ public static long getTimePartitionInterval() {
+ if (timePartitionInterval == -1) {
initTimePartition();
}
- return timePartitionIntervalForStorage;
+ return timePartitionInterval;
}
public static long getTimePartition(long time) {
- if (timePartitionIntervalForStorage == -1) {
+ if (timePartitionInterval == -1) {
initTimePartition();
}
- return enablePartition ? time / timePartitionIntervalForStorage : 0;
- }
-
- public static boolean isEnablePartition() {
- return enablePartition;
- }
-
- @TestOnly
- public static void setEnablePartition(boolean enablePartition) {
- StorageEngineV2.enablePartition = enablePartition;
+ return time / timePartitionInterval;
}
/** block insertion if the insertion is rejected by memory control */
@@ -309,12 +296,7 @@ public class StorageEngineV2 implements IService {
@Override
public void start() {
// build time Interval to divide time partition
- if (!enablePartition) {
- timePartitionIntervalForStorage = Long.MAX_VALUE;
- } else {
- initTimePartition();
- }
-
+ initTimePartition();
// create systemDir
try {
FileUtils.forceMkdir(SystemFileFactory.INSTANCE.getFile(systemDir));
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/load/AlignedChunkData.java b/server/src/main/java/org/apache/iotdb/db/engine/load/AlignedChunkData.java
index 0dc5b004f3..e8cb2f20c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/load/AlignedChunkData.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/load/AlignedChunkData.java
@@ -190,7 +190,7 @@ public class AlignedChunkData implements ChunkData {
pageNumbers.set(pageNumbers.size() - 1, pageNumbers.get(pageNumbers.size() - 1) + 1);
satisfiedLengthQueue.offer(satisfiedLength);
long startTime = timePartitionSlot.getStartTime();
- long endTime = startTime + TimePartitionUtils.getTimePartitionIntervalForRouting();
+ long endTime = startTime + TimePartitionUtils.getTimePartitionInterval();
dataSize += ReadWriteIOUtils.write(true, stream);
dataSize += ReadWriteIOUtils.write(satisfiedLength, stream);
@@ -208,7 +208,7 @@ public class AlignedChunkData implements ChunkData {
throws IOException {
pageNumbers.set(pageNumbers.size() - 1, pageNumbers.get(pageNumbers.size() - 1) + 1);
long startTime = timePartitionSlot.getStartTime();
- long endTime = startTime + TimePartitionUtils.getTimePartitionIntervalForRouting();
+ long endTime = startTime + TimePartitionUtils.getTimePartitionInterval();
int satisfiedLength = satisfiedLengthQueue.poll();
dataSize += ReadWriteIOUtils.write(true, stream);
dataSize += ReadWriteIOUtils.write(satisfiedLength, stream);
@@ -377,7 +377,7 @@ public class AlignedChunkData implements ChunkData {
public static AlignedChunkData deserialize(InputStream stream) throws IOException, PageException {
TTimePartitionSlot timePartitionSlot =
- TimePartitionUtils.getTimePartitionForRouting(ReadWriteIOUtils.readLong(stream));
+ TimePartitionUtils.getTimePartition(ReadWriteIOUtils.readLong(stream));
String device = ReadWriteIOUtils.readString(stream);
boolean needDecodeChunk = ReadWriteIOUtils.readBool(stream);
int chunkHeaderListSize = ReadWriteIOUtils.readInt(stream);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/load/NonAlignedChunkData.java b/server/src/main/java/org/apache/iotdb/db/engine/load/NonAlignedChunkData.java
index 4c2e548b2d..1e4cf6a27a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/load/NonAlignedChunkData.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/load/NonAlignedChunkData.java
@@ -154,7 +154,7 @@ public class NonAlignedChunkData implements ChunkData {
throws IOException {
pageNumber += 1;
long startTime = timePartitionSlot.getStartTime();
- long endTime = startTime + TimePartitionUtils.getTimePartitionIntervalForRouting();
+ long endTime = startTime + TimePartitionUtils.getTimePartitionInterval();
dataSize += ReadWriteIOUtils.write(true, stream);
dataSize += ReadWriteIOUtils.write(satisfiedLength, stream);
@@ -261,7 +261,7 @@ public class NonAlignedChunkData implements ChunkData {
public static NonAlignedChunkData deserialize(InputStream stream)
throws IOException, PageException {
TTimePartitionSlot timePartitionSlot =
- TimePartitionUtils.getTimePartitionForRouting(ReadWriteIOUtils.readLong(stream));
+ TimePartitionUtils.getTimePartition(ReadWriteIOUtils.readLong(stream));
String device = ReadWriteIOUtils.readString(stream);
boolean needDecodeChunk = ReadWriteIOUtils.readBool(stream);
byte chunkType = ReadWriteIOUtils.readByte(stream);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/load/TsFileSplitter.java b/server/src/main/java/org/apache/iotdb/db/engine/load/TsFileSplitter.java
index edaa692eac..e3010f0eeb 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/load/TsFileSplitter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/load/TsFileSplitter.java
@@ -113,7 +113,7 @@ public class TsFileSplitter {
== TsFileConstant.TIME_COLUMN_MASK);
IChunkMetadata chunkMetadata = offset2ChunkMetadata.get(chunkOffset - Byte.BYTES);
TTimePartitionSlot timePartitionSlot =
- TimePartitionUtils.getTimePartitionForRouting(chunkMetadata.getStartTime());
+ TimePartitionUtils.getTimePartition(chunkMetadata.getStartTime());
ChunkData chunkData =
ChunkData.createChunkData(isAligned, curDevice, header, timePartitionSlot);
@@ -156,7 +156,7 @@ public class TsFileSplitter {
? chunkMetadata.getStartTime()
: pageHeader.getStartTime();
TTimePartitionSlot pageTimePartitionSlot =
- TimePartitionUtils.getTimePartitionForRouting(startTime);
+ TimePartitionUtils.getTimePartition(startTime);
if (!timePartitionSlot.equals(pageTimePartitionSlot)) {
if (!isAligned) {
consumeChunkData(measurementId, chunkOffset, chunkData);
@@ -185,7 +185,7 @@ public class TsFileSplitter {
int satisfiedLength = 0;
long endTime =
timePartitionSlot.getStartTime()
- + TimePartitionUtils.getTimePartitionIntervalForRouting();
+ + TimePartitionUtils.getTimePartitionInterval();
for (int i = 0; i < times.length; i++) {
if (times[i] >= endTime) {
chunkData.writeDecodePage(times, values, satisfiedLength);
@@ -197,11 +197,11 @@ public class TsFileSplitter {
consumeChunkData(measurementId, chunkOffset, chunkData);
}
- timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[i]);
+ timePartitionSlot = TimePartitionUtils.getTimePartition(times[i]);
satisfiedLength = 0;
endTime =
timePartitionSlot.getStartTime()
- + TimePartitionUtils.getTimePartitionIntervalForRouting();
+ + TimePartitionUtils.getTimePartitionInterval();
chunkData =
ChunkData.createChunkData(isAligned, curDevice, header, timePartitionSlot);
}
@@ -378,17 +378,17 @@ public class TsFileSplitter {
}
private boolean needDecodeChunk(IChunkMetadata chunkMetadata) {
- return !TimePartitionUtils.getTimePartitionForRouting(chunkMetadata.getStartTime())
- .equals(TimePartitionUtils.getTimePartitionForRouting(chunkMetadata.getEndTime()));
+ return !TimePartitionUtils.getTimePartition(chunkMetadata.getStartTime())
+ .equals(TimePartitionUtils.getTimePartition(chunkMetadata.getEndTime()));
}
private boolean needDecodePage(PageHeader pageHeader, IChunkMetadata chunkMetadata) {
if (pageHeader.getStatistics() == null) {
- return !TimePartitionUtils.getTimePartitionForRouting(chunkMetadata.getStartTime())
- .equals(TimePartitionUtils.getTimePartitionForRouting(chunkMetadata.getEndTime()));
+ return !TimePartitionUtils.getTimePartition(chunkMetadata.getStartTime())
+ .equals(TimePartitionUtils.getTimePartition(chunkMetadata.getEndTime()));
}
- return !TimePartitionUtils.getTimePartitionForRouting(pageHeader.getStartTime())
- .equals(TimePartitionUtils.getTimePartitionForRouting(pageHeader.getEndTime()));
+ return !TimePartitionUtils.getTimePartition(pageHeader.getStartTime())
+ .equals(TimePartitionUtils.getTimePartition(pageHeader.getEndTime()));
}
private Pair<long[], Object[]> decodePage(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 2690173377..7028955335 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -1595,10 +1595,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<TTimePartitionSlot> timePartitionSlots = new ArrayList<>();
String device = entry.getKey();
long endTime = device2MaxTime.get(device);
- long interval = TimePartitionUtils.timePartitionIntervalForRouting;
+ long interval = TimePartitionUtils.timePartitionInterval;
long time = (entry.getValue() / interval) * interval;
for (; time <= endTime; time += interval) {
- timePartitionSlots.add(TimePartitionUtils.getTimePartitionForRouting(time));
+ timePartitionSlots.add(TimePartitionUtils.getTimePartition(time));
}
DataPartitionQueryParam dataPartitionQueryParam = new DataPartitionQueryParam();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
index 04da130949..1c965e5e69 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
@@ -79,12 +79,12 @@ public class LoadSingleTsFileNode extends WritePlanNode {
needDecodeTsFile = false;
for (String device : resource.getDevices()) {
TTimePartitionSlot startSlot =
- TimePartitionUtils.getTimePartitionForRouting(resource.getStartTime(device));
+ TimePartitionUtils.getTimePartition(resource.getStartTime(device));
if (timePartitionSlot == null) {
timePartitionSlot = startSlot;
}
if (!startSlot.equals(timePartitionSlot)
- || !TimePartitionUtils.getTimePartitionForRouting(resource.getEndTime(device))
+ || !TimePartitionUtils.getTimePartition(resource.getEndTime(device))
.equals(timePartitionSlot)) {
needDecodeTsFile = true;
return;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
index b1e824c157..459ed6d04b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
@@ -99,7 +99,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue {
@Override
public List<WritePlanNode> splitByPartition(Analysis analysis) {
- TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(time);
+ TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartition(time);
this.dataRegionReplicaSet =
analysis
.getDataPartitionInfo()
@@ -178,7 +178,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue {
@TestOnly
public List<TTimePartitionSlot> getTimePartitionSlots() {
- return Collections.singletonList(TimePartitionUtils.getTimePartitionForRouting(time));
+ return Collections.singletonList(TimePartitionUtils.getTimePartition(time));
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java
index 31c435c92e..70cfaa63b2 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java
@@ -268,7 +268,7 @@ public class InsertRowsNode extends InsertNode implements BatchInsertNode {
.getDataPartitionInfo()
.getDataRegionReplicaSetForWriting(
insertRowNode.devicePath.getFullPath(),
- TimePartitionUtils.getTimePartitionForRouting(insertRowNode.getTime()));
+ TimePartitionUtils.getTimePartition(insertRowNode.getTime()));
if (splitMap.containsKey(dataRegionReplicaSet)) {
InsertRowsNode tmpNode = splitMap.get(dataRegionReplicaSet);
tmpNode.addOneInsertRowNode(insertRowNode, i);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java
index b2305dabd4..70ea605e9a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java
@@ -174,7 +174,7 @@ public class InsertRowsOfOneDeviceNode extends InsertNode implements BatchInsert
.getDataPartitionInfo()
.getDataRegionReplicaSetForWriting(
devicePath.getFullPath(),
- TimePartitionUtils.getTimePartitionForRouting(insertRowNode.getTime()));
+ TimePartitionUtils.getTimePartition(insertRowNode.getTime()));
List<InsertRowNode> tmpMap =
splitMap.computeIfAbsent(dataRegionReplicaSet, k -> new ArrayList<>());
List<Integer> tmpIndexMap =
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
index 377577bae9..250bbf1679 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
@@ -226,10 +226,10 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue {
return Collections.emptyList();
}
long startTime =
- (times[0] / TimePartitionUtils.timePartitionIntervalForRouting)
- * TimePartitionUtils.timePartitionIntervalForRouting; // included
- long endTime = startTime + TimePartitionUtils.timePartitionIntervalForRouting; // excluded
- TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[0]);
+ (times[0] / TimePartitionUtils.timePartitionInterval)
+ * TimePartitionUtils.timePartitionInterval; // included
+ long endTime = startTime + TimePartitionUtils.timePartitionInterval; // excluded
+ TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartition(times[0]);
int startLoc = 0; // included
List<TTimePartitionSlot> timePartitionSlots = new ArrayList<>();
@@ -245,9 +245,9 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue {
startLoc = i;
startTime = endTime;
endTime =
- (times[i] / TimePartitionUtils.timePartitionIntervalForRouting + 1)
- * TimePartitionUtils.timePartitionIntervalForRouting;
- timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[i]);
+ (times[i] / TimePartitionUtils.timePartitionInterval + 1)
+ * TimePartitionUtils.timePartitionInterval;
+ timePartitionSlot = TimePartitionUtils.getTimePartition(times[i]);
}
}
@@ -319,18 +319,18 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue {
public List<TTimePartitionSlot> getTimePartitionSlots() {
List<TTimePartitionSlot> result = new ArrayList<>();
long startTime =
- (times[0] / TimePartitionUtils.timePartitionIntervalForRouting)
- * TimePartitionUtils.timePartitionIntervalForRouting; // included
- long endTime = startTime + TimePartitionUtils.timePartitionIntervalForRouting; // excluded
- TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[0]);
+ (times[0] / TimePartitionUtils.timePartitionInterval)
+ * TimePartitionUtils.timePartitionInterval; // included
+ long endTime = startTime + TimePartitionUtils.timePartitionInterval; // excluded
+ TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartition(times[0]);
for (int i = 1; i < times.length; i++) { // times are sorted in session API.
if (times[i] >= endTime) {
result.add(timePartitionSlot);
// next init
endTime =
- (times[i] / TimePartitionUtils.timePartitionIntervalForRouting + 1)
- * TimePartitionUtils.timePartitionIntervalForRouting;
- timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[i]);
+ (times[i] / TimePartitionUtils.timePartitionInterval + 1)
+ * TimePartitionUtils.timePartitionInterval;
+ timePartitionSlot = TimePartitionUtils.getTimePartition(times[i]);
}
}
result.add(timePartitionSlot);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
index 545731e780..146d153330 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertMultiTabletsStatement.java
@@ -106,7 +106,7 @@ public class InsertMultiTabletsStatement extends InsertBaseStatement {
TRegionReplicaSet regionReplicaSet =
dataPartition.getDataRegionReplicaSetForWriting(
insertTabletStatement.devicePath.getFullPath(),
- TimePartitionUtils.getTimePartitionForRouting(
+ TimePartitionUtils.getTimePartition(
insertTabletStatement.getTimes()[insertTabletStatement.getTimes().length - 1]));
result.add(regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
index ff43317e67..2f3e20853e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowStatement.java
@@ -127,14 +127,14 @@ public class InsertRowStatement extends InsertBaseStatement {
}
public List<TTimePartitionSlot> getTimePartitionSlots() {
- return Collections.singletonList(TimePartitionUtils.getTimePartitionForRouting(time));
+ return Collections.singletonList(TimePartitionUtils.getTimePartition(time));
}
@Override
public List<TEndPoint> collectRedirectInfo(DataPartition dataPartition) {
TRegionReplicaSet regionReplicaSet =
dataPartition.getDataRegionReplicaSetForWriting(
- devicePath.getFullPath(), TimePartitionUtils.getTimePartitionForRouting(time));
+ devicePath.getFullPath(), TimePartitionUtils.getTimePartition(time));
return Collections.singletonList(
regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
index 25049ff053..834717aaa7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
@@ -77,8 +77,7 @@ public class InsertRowsOfOneDeviceStatement extends InsertBaseStatement {
public List<TTimePartitionSlot> getTimePartitionSlots() {
Set<TTimePartitionSlot> timePartitionSlotSet = new HashSet<>();
for (InsertRowStatement insertRowStatement : insertRowStatementList) {
- timePartitionSlotSet.add(
- TimePartitionUtils.getTimePartitionForRouting(insertRowStatement.getTime()));
+ timePartitionSlotSet.add(TimePartitionUtils.getTimePartition(insertRowStatement.getTime()));
}
return new ArrayList<>(timePartitionSlotSet);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
index 6c130f99d7..2af88eb9ad 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertRowsStatement.java
@@ -106,7 +106,7 @@ public class InsertRowsStatement extends InsertBaseStatement {
TRegionReplicaSet regionReplicaSet =
dataPartition.getDataRegionReplicaSetForWriting(
insertRowStatement.devicePath.getFullPath(),
- TimePartitionUtils.getTimePartitionForRouting(insertRowStatement.getTime()));
+ TimePartitionUtils.getTimePartition(insertRowStatement.getTime()));
result.add(regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
return result;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
index 77a3eee1df..314fdf2d61 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/InsertTabletStatement.java
@@ -89,18 +89,18 @@ public class InsertTabletStatement extends InsertBaseStatement {
public List<TTimePartitionSlot> getTimePartitionSlots() {
List<TTimePartitionSlot> result = new ArrayList<>();
long startTime =
- (times[0] / TimePartitionUtils.timePartitionIntervalForRouting)
- * TimePartitionUtils.timePartitionIntervalForRouting; // included
- long endTime = startTime + TimePartitionUtils.timePartitionIntervalForRouting; // excluded
- TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[0]);
+ (times[0] / TimePartitionUtils.timePartitionInterval)
+ * TimePartitionUtils.timePartitionInterval; // included
+ long endTime = startTime + TimePartitionUtils.timePartitionInterval; // excluded
+ TTimePartitionSlot timePartitionSlot = TimePartitionUtils.getTimePartition(times[0]);
for (int i = 1; i < times.length; i++) { // times are sorted in session API.
if (times[i] >= endTime) {
result.add(timePartitionSlot);
// next init
endTime =
- (times[i] / TimePartitionUtils.timePartitionIntervalForRouting + 1)
- * TimePartitionUtils.timePartitionIntervalForRouting;
- timePartitionSlot = TimePartitionUtils.getTimePartitionForRouting(times[i]);
+ (times[i] / TimePartitionUtils.timePartitionInterval + 1)
+ * TimePartitionUtils.timePartitionInterval;
+ timePartitionSlot = TimePartitionUtils.getTimePartition(times[i]);
}
}
result.add(timePartitionSlot);
@@ -111,8 +111,7 @@ public class InsertTabletStatement extends InsertBaseStatement {
public List<TEndPoint> collectRedirectInfo(DataPartition dataPartition) {
TRegionReplicaSet regionReplicaSet =
dataPartition.getDataRegionReplicaSetForWriting(
- devicePath.getFullPath(),
- TimePartitionUtils.getTimePartitionForRouting(times[times.length - 1]));
+ devicePath.getFullPath(), TimePartitionUtils.getTimePartition(times[times.length - 1]));
return Collections.singletonList(
regionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
index 412e419c6d..763b7e0d5a 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
@@ -25,21 +25,21 @@ import org.apache.iotdb.db.conf.ServerConfigConsistent;
public class TimePartitionUtils {
@ServerConfigConsistent
- public static long timePartitionIntervalForRouting =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForRouting();
+ public static long timePartitionInterval =
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
- public static TTimePartitionSlot getTimePartitionForRouting(long time) {
+ public static TTimePartitionSlot getTimePartition(long time) {
TTimePartitionSlot timePartitionSlot = new TTimePartitionSlot();
- timePartitionSlot.setStartTime(time - time % timePartitionIntervalForRouting);
+ timePartitionSlot.setStartTime(time - time % timePartitionInterval);
return timePartitionSlot;
}
- public static long getTimePartitionIntervalForRouting() {
- return timePartitionIntervalForRouting;
+ public static long getTimePartitionInterval() {
+ return timePartitionInterval;
}
@TestOnly
- public static void setTimePartitionIntervalForRouting(long timePartitionIntervalForRouting) {
- TimePartitionUtils.timePartitionIntervalForRouting = timePartitionIntervalForRouting;
+ public static void setTimePartitionInterval(long timePartitionInterval) {
+ TimePartitionUtils.timePartitionInterval = timePartitionInterval;
}
}
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 4429dccc36..97ef5e09ef 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
@@ -34,8 +34,8 @@ public class SizeTieredCompactionSelectorTest {
@Test
public void testSubmitWhenNextTimePartitionExists() {
long originPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(1000000);
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(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 58f7311635..3e852fdf91 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
@@ -427,11 +427,9 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getTimePartitionIntervalForStorage();
- boolean defaultEnablePartition = config.isEnablePartition();
+ long defaultTimePartition = config.getTimePartitionInterval();
config.setEnableDiscardOutOfOrderData(true);
- config.setEnablePartition(true);
- config.setTimePartitionIntervalForStorage(100000);
+ config.setTimePartitionInterval(100000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -511,8 +509,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setTimePartitionIntervalForStorage(defaultTimePartition);
- config.setEnablePartition(defaultEnablePartition);
+ config.setTimePartitionInterval(defaultTimePartition);
}
@Test
@@ -520,11 +517,9 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getTimePartitionIntervalForStorage();
- boolean defaultEnablePartition = config.isEnablePartition();
+ long defaultTimePartition = config.getTimePartitionInterval();
config.setEnableDiscardOutOfOrderData(true);
- config.setEnablePartition(true);
- config.setTimePartitionIntervalForStorage(1200000);
+ config.setTimePartitionInterval(1200000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -604,8 +599,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setTimePartitionIntervalForStorage(defaultTimePartition);
- config.setEnablePartition(defaultEnablePartition);
+ config.setTimePartitionInterval(defaultTimePartition);
}
@Test
@@ -613,11 +607,9 @@ public class DataRegionTest {
throws QueryProcessException, IllegalPathException, IOException, TriggerExecutionException,
WriteProcessException {
boolean defaultEnableDiscard = config.isEnableDiscardOutOfOrderData();
- long defaultTimePartition = config.getTimePartitionIntervalForStorage();
- boolean defaultEnablePartition = config.isEnablePartition();
+ long defaultTimePartition = config.getTimePartitionInterval();
config.setEnableDiscardOutOfOrderData(true);
- config.setEnablePartition(true);
- config.setTimePartitionIntervalForStorage(1000000);
+ config.setTimePartitionInterval(1000000);
String[] measurements = new String[2];
measurements[0] = "s0";
@@ -697,8 +689,7 @@ public class DataRegionTest {
}
config.setEnableDiscardOutOfOrderData(defaultEnableDiscard);
- config.setTimePartitionIntervalForStorage(defaultTimePartition);
- config.setEnablePartition(defaultEnablePartition);
+ config.setTimePartitionInterval(defaultTimePartition);
}
@Test
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 f632e154bf..e757777e78 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
@@ -86,9 +86,8 @@ public class TTLTest {
@Before
public void setUp() throws MetadataException, DataRegionException {
- prevPartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForStorage();
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForStorage(86400000);
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(86400000);
EnvironmentUtils.envSetUp();
createSchemas();
}
@@ -97,9 +96,7 @@ public class TTLTest {
public void tearDown() throws IOException, StorageEngineException {
dataRegion.syncCloseAllWorkingTsFileProcessors();
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setTimePartitionIntervalForStorage(prevPartitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(prevPartitionInterval);
}
private void createSchemas() throws MetadataException, DataRegionException {
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
index 1209b8dc36..4a28df32e6 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
@@ -69,9 +69,9 @@ public class WritePlanNodeSplitTest {
@Before
public void setUp() {
prevTimePartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getTimePartitionIntervalForRouting();
- IoTDBDescriptor.getInstance().getConfig().setTimePartitionIntervalForRouting(100);
- TimePartitionUtils.setTimePartitionIntervalForRouting(100);
+ IoTDBDescriptor.getInstance().getConfig().getTimePartitionInterval();
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(100);
+ TimePartitionUtils.setTimePartitionInterval(100);
executorClassName = IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionExecutorClass();
seriesSlotPartitionNum = IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionSlotNum();
@@ -93,7 +93,7 @@ public class WritePlanNodeSplitTest {
Map<TTimePartitionSlot, List<TRegionReplicaSet>> timePartitionSlotMap = new HashMap<>();
for (int t = 0; t < 5; t++) {
timePartitionSlotMap.put(
- new TTimePartitionSlot(t * TimePartitionUtils.timePartitionIntervalForRouting),
+ new TTimePartitionSlot(t * TimePartitionUtils.timePartitionInterval),
Collections.singletonList(
new TRegionReplicaSet(
new TConsensusGroupId(TConsensusGroupType.DataRegion, t), null)));
@@ -110,7 +110,7 @@ public class WritePlanNodeSplitTest {
Map<TTimePartitionSlot, List<TRegionReplicaSet>> timePartitionSlotMap = new HashMap<>();
for (int t = 0; t < 5; t++) {
timePartitionSlotMap.put(
- new TTimePartitionSlot(t * TimePartitionUtils.timePartitionIntervalForRouting),
+ new TTimePartitionSlot(t * TimePartitionUtils.timePartitionInterval),
Collections.singletonList(
new TRegionReplicaSet(
new TConsensusGroupId(TConsensusGroupType.DataRegion, 5), null)));
@@ -266,7 +266,7 @@ public class WritePlanNodeSplitTest {
for (int i = 0; i < 5; i++) {
InsertRowNode insertRowNode = new InsertRowNode(new PlanNodeId("plan node 3"));
insertRowNode.setDevicePath(new PartialPath(String.format("root.sg1.d%d", i)));
- insertRowNode.setTime(i * TimePartitionUtils.timePartitionIntervalForRouting);
+ insertRowNode.setTime(i * TimePartitionUtils.timePartitionInterval);
insertRowsNode.addOneInsertRowNode(insertRowNode, 2 * i);
insertRowNode = new InsertRowNode(new PlanNodeId("plan node 3"));
@@ -294,9 +294,7 @@ public class WritePlanNodeSplitTest {
@After
public void tearDown() {
- TimePartitionUtils.setTimePartitionIntervalForRouting(prevTimePartitionInterval);
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setTimePartitionIntervalForRouting(prevTimePartitionInterval);
+ TimePartitionUtils.setTimePartitionInterval(prevTimePartitionInterval);
+ IoTDBDescriptor.getInstance().getConfig().setTimePartitionInterval(prevTimePartitionInterval);
}
}
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 a56f16e080..44a9453a38 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
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.tools;
// public class TsFileAndModSettleToolTest {
-// private final boolean newEnablePartition = true;
// private final long newPartitionInterval = 3600_000;
// protected final long maxTimestamp = 50000L; // 100000000L;
// protected final String folder = "target" + File.separator + "settle";
@@ -32,7 +31,6 @@ package org.apache.iotdb.db.tools;
// private final Planner processor = new Planner();
// private String path = null;
// private IoTDBConfig config;
-// private boolean originEnablePartition;
// private long originPartitionInterval;
//
// @Before
@@ -40,13 +38,10 @@ package org.apache.iotdb.db.tools;
// EnvironmentUtils.envSetUp();
//
// config = IoTDBDescriptor.getInstance().getConfig();
-// originEnablePartition = config.isEnablePartition();
// originPartitionInterval = config.getTimePartitionIntervalForStorage();
//
-// config.setEnablePartition(newEnablePartition);
// config.setTimePartitionIntervalForStorage(newPartitionInterval);
//
-// StorageEngineV2.setEnablePartition(newEnablePartition);
// StorageEngineV2.setPartitionIntervalForStorage(newPartitionInterval);
//
// File f = new File(folder);
@@ -66,10 +61,8 @@ package org.apache.iotdb.db.tools;
// Assert.assertTrue(deleteSuccess);
// }
// }
-// config.setEnablePartition(originEnablePartition);
// config.setTimePartitionIntervalForStorage(originPartitionInterval);
//
-// StorageEngine.setEnablePartition(originEnablePartition);
// StorageEngine.setTimePartitionInterval(originPartitionInterval);
//
// File directory = new File(folder);
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 79c5665717..07841ed630 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
@@ -78,7 +78,7 @@ public class TsFileRewriteToolTest {
private final Planner processor = new Planner();
private String path = null;
private IoTDBConfig config;
- private boolean originEnablePartition;
+
private long originPartitionInterval;
public TsFileRewriteToolTest() throws QueryProcessException {}
@@ -86,11 +86,8 @@ public class TsFileRewriteToolTest {
@Before
public void setUp() {
config = IoTDBDescriptor.getInstance().getConfig();
- originEnablePartition = config.isEnablePartition();
- originPartitionInterval = config.getTimePartitionIntervalForStorage();
- boolean newEnablePartition = true;
- config.setEnablePartition(newEnablePartition);
- config.setTimePartitionIntervalForStorage(newPartitionInterval);
+ originPartitionInterval = config.getTimePartitionInterval();
+ config.setTimePartitionInterval(newPartitionInterval);
EnvironmentUtils.envSetUp();
File f = new File(folder);
@@ -108,8 +105,7 @@ public class TsFileRewriteToolTest {
boolean deleteSuccess = f.delete();
Assert.assertTrue(deleteSuccess);
}
- config.setEnablePartition(originEnablePartition);
- config.setTimePartitionIntervalForStorage(originPartitionInterval);
+ config.setTimePartitionInterval(originPartitionInterval);
File directory = new File(folder);
try {