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 08ff211ed7 [IOTDB-4596] Change default time partition interval from 1
day to 1 week (#7556)
08ff211ed7 is described below
commit 08ff211ed790c1f3801c7495eb719866a5bc9f1c
Author: Alan Choo <[email protected]>
AuthorDate: Tue Oct 11 16:57:27 2022 +0800
[IOTDB-4596] Change default time partition interval from 1 day to 1 week
(#7556)
---
confignode/src/assembly/resources/conf/iotdb-confignode.properties | 4 ++--
.../java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java | 2 +-
.../service/thrift/ConfigNodeRPCServiceProcessorTest.java | 2 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 6 +++---
docs/UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 2 +-
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 6 +++---
docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +-
docs/zh/UserGuide/Reference/DataNode-Config-Manual.md | 2 +-
.../java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java | 2 +-
server/src/assembly/resources/conf/iotdb-datanode.properties | 4 ++--
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/confignode/src/assembly/resources/conf/iotdb-confignode.properties
b/confignode/src/assembly/resources/conf/iotdb-confignode.properties
index 29be49196e..aa1aed1ab0 100644
--- a/confignode/src/assembly/resources/conf/iotdb-confignode.properties
+++ b/confignode/src/assembly/resources/conf/iotdb-confignode.properties
@@ -131,9 +131,9 @@ target_config_nodes=127.0.0.1:22277
# default_ttl=36000000
-# Time partition interval in milliseconds, default is equal to one day
+# Time partition interval in milliseconds, default is equal to one week
# Datatype: long
-# time_partition_interval_for_routing=86400000
+# time_partition_interval_for_routing=604800000
# Default number of SchemaRegion replicas
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 29fdac0f6e..269ac05a5f 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -109,7 +109,7 @@ public class ConfigNodeConfig {
IoTDBConstant.EXT_FOLDER_NAME + File.separator +
IoTDBConstant.UDF_TMP_FOLDER_NAME;
/** Time partition interval in milliseconds */
- private long timePartitionInterval = 86400000;
+ private long timePartitionInterval = 604_800_000;
/** Default number of SchemaRegion replicas */
private int schemaReplicationFactor = 1;
diff --git
a/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
b/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
index 471a9b5e44..1ce234806f 100644
---
a/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
+++
b/confignode/src/test/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessorTest.java
@@ -195,7 +195,7 @@ public class ConfigNodeRPCServiceProcessorTest {
Assert.assertEquals(Long.MAX_VALUE, storageGroupSchema.getTTL());
Assert.assertEquals(1, storageGroupSchema.getSchemaReplicationFactor());
Assert.assertEquals(1, storageGroupSchema.getDataReplicationFactor());
- Assert.assertEquals(86400000,
storageGroupSchema.getTimePartitionInterval());
+ Assert.assertEquals(604800000,
storageGroupSchema.getTimePartitionInterval());
storageGroupSchema = schemaMap.get(sg1);
Assert.assertNotNull(storageGroupSchema);
Assert.assertEquals(sg1, storageGroupSchema.getName());
diff --git a/docs/UserGuide/Data-Concept/Time-Partition.md
b/docs/UserGuide/Data-Concept/Time-Partition.md
index 37b1ca2f88..30b90e88dc 100644
--- a/docs/UserGuide/Data-Concept/Time-Partition.md
+++ b/docs/UserGuide/Data-Concept/Time-Partition.md
@@ -40,7 +40,7 @@ Time partition divides data according to time, and a time
partition is used to s
|:---:|:-------------------------------------------------------------------------------------------------------|
|Description| Time range for dividing storage group, time series data will be
divided into groups by this time range |
|Type| Int64
|
-|Default| 86400000
|
+|Default| 604800000
|
|Effective| Only allowed to be modified in first start up
|
## Configuration example
@@ -49,9 +49,9 @@ Enable time partition and set partition_interval to 86400000
(one day), then the
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Data%20Concept/Time-Partition/time_partition_example.png?raw=true";
alt="time partition example">
-* Insert one datapoint with timestamp 0, calculate 0/86400 = 0, then this
datapoint will be stored in TsFile under folder 0
+* Insert one datapoint with timestamp 0, calculate 0/86400000 = 0, then this
datapoint will be stored in TsFile under folder 0
-* Insert one datapoint with timestamp 1609459200010, calculate
1609459200010/86400 = 18628, then this datapoint will be stored in TsFile under
folder 18628
+* Insert one datapoint with timestamp 1609459200010, calculate
1609459200010/86400000 = 18628, then this datapoint will be stored in TsFile
under folder 18628
## Suggestions
diff --git a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
index e87858193e..1672d1c35e 100644
--- a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
+++ b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md
@@ -251,7 +251,7 @@ The global configuration of cluster is in ConfigNode.
|Description| Time partition interval of data when ConfigNode allocate data |
|Type| Long |
|Unit| ms |
-|Default| 86400000 |
+|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 e671ec8c4c..9cec4f491d 100644
--- a/docs/UserGuide/Reference/DataNode-Config-Manual.md
+++ b/docs/UserGuide/Reference/DataNode-Config-Manual.md
@@ -548,7 +548,7 @@ The permission definitions are in
${IOTDB\_CONF}/conf/jmx.access.
|Description| Time range for dividing storage group, time series data will be
divided into groups by this time range |
|Type| Int64
|
|Unit| ms
|
-|Default| 86400000
|
+|Default| 604800000
|
|Effective| Only allowed to be modified in first start up
|
diff --git a/docs/zh/UserGuide/Data-Concept/Time-Partition.md
b/docs/zh/UserGuide/Data-Concept/Time-Partition.md
index 807284b867..3c4fac0c7e 100644
--- a/docs/zh/UserGuide/Data-Concept/Time-Partition.md
+++ b/docs/zh/UserGuide/Data-Concept/Time-Partition.md
@@ -40,7 +40,7 @@
|:---:|:----------------------------------------|
|描述| 存储组分区的时间段长度，用户指定的存储组下会使用该时间段进行分区，单位：毫秒 |
|类型| Int64 |
-|默认值| 86400000 |
+|默认值| 604800000 |
|改后生效方式| 仅允许在第一次启动服务前修改 |
## 配置示例
@@ -49,9 +49,9 @@
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Data%20Concept/Time-Partition/time_partition_example.png?raw=true";
alt="time partition example">
-* 插入一条时间戳为 0 的数据，计算 0 / 86400 = 0，则该数据会被存储到 0 号文件夹下的TsFile中
+* 插入一条时间戳为 0 的数据，计算 0 / 86400000 = 0，则该数据会被存储到 0 号文件夹下的TsFile中
-* 插入一条时间戳为 1609459200010 的数据，计算 1609459200010 / 86400 = 18628，则该数据会被存储到 18628
号文件夹下的TsFile中
+* 插入一条时间戳为 1609459200010 的数据，计算 1609459200010 / 86400000 = 18628，则该数据会被存储到
18628 号文件夹下的TsFile中
## 使用建议
diff --git a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
index 43cec107c5..df58792880 100644
--- a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md
@@ -246,7 +246,7 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。
|描述| 存储组默认的数据时间分区间隔 |
|类型| Long |
|单位| 毫秒 |
-|默认值| 86400000 |
+|默认值| 604800000 |
|改后生效方式| 仅允许在第一次启动服务前修改 |
### 数据目录
diff --git a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
index bd647c4c8f..9c6b502910 100644
--- a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md
@@ -1662,7 +1662,7 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB
|:---:|:-----------------------------------------|
|描述| 用于存储组分区的时间段长度，用户指定的存储组下会使用该时间段进行分区，单位：毫秒 |
|类型| Int64 |
-|默认值| 86400000 |
+|默认值| 604800000 |
|改后生效方式| 仅允许在第一次启动服务前修改 |
* data\_region\_num
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java
index e6a22a6c3d..195bb11b73 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/IoTDBClusterPartitionIT.java
@@ -88,7 +88,7 @@ public class IoTDBClusterPartitionIT {
private static final int testReplicationFactor = 3;
protected static long originalTimePartitionInterval;
- private static final long testTimePartitionInterval = 86400000;
+ private static final long testTimePartitionInterval = 604800000;
private static final String sg = "root.sg";
private static final int storageGroupNum = 5;
diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties
b/server/src/assembly/resources/conf/iotdb-datanode.properties
index 06a40a8757..38c50a32c6 100644
--- a/server/src/assembly/resources/conf/iotdb-datanode.properties
+++ b/server/src/assembly/resources/conf/iotdb-datanode.properties
@@ -1055,9 +1055,9 @@ timestamp_precision=ms
# Datatype: boolean
# enable_partition=false
-# time range for partitioning data inside each data region, the unit is
millisecond
+# 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=86400000
+# time_partition_interval_for_storage=604800000
####################
### Influx DB RPC Service Configuration
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 b7666aa4de..b9260ca254 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
@@ -762,10 +762,10 @@ public class IoTDBConfig {
private boolean enablePartition = false;
/** Time partition interval for storage in milliseconds */
- private long timePartitionIntervalForStorage = 86400000;
+ private long timePartitionIntervalForStorage = 604_800_000;
/** Time partition interval for routing in milliseconds */
- private long timePartitionIntervalForRouting = 86400000;
+ private long timePartitionIntervalForRouting = 604_800_000;
/**
* Level of TimeIndex, which records the start time and end time of
TsFileResource. Currently,
![https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Data%20Concept/Time-Partition/time_partition_example.png?raw=true"](https://github.com/apache/iotdb-bin-resources/blob/main/docs/UserGuide/Data%20Concept/Time-Partition/time_partition_example.png?raw=true"){kind=link}