(iotdb) branch EnhancedDeviceCrossRegionIT updated: Change back default config

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch EnhancedDeviceCrossRegionIT
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/EnhancedDeviceCrossRegionIT by 
this push:
     new de411a6e9b5 Change back default config
de411a6e9b5 is described below

commit de411a6e9b583a19e1f8cefbba9f57b78ba5d94f
Author: JackieTien97 <jackietie...@gmail.com>
AuthorDate: Wed Sep 3 10:19:57 2025 +0800

    Change back default config
---
 .../iotdb/confignode/conf/ConfigNodeConfig.java    |  2 +-
 .../apache/iotdb/commons/conf/CommonConfig.java    | 25 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 12e1224d58d..57e619a9baa 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -82,7 +82,7 @@ public class ConfigNodeConfig {
   private String seriesPartitionExecutorClass =
       "org.apache.iotdb.commons.partition.executor.hash.BKDRHashExecutor";
 
-  private String dataPartitionAllocationStrategy = "SHUFFLE";
+  private String dataPartitionAllocationStrategy = "INHERIT";
 
   /** The policy of extension SchemaRegionGroup for each Database. */
   private RegionGroupExtensionPolicy schemaRegionGroupExtensionPolicy =
diff --git 
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
 
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index bb85c74940e..817bb3a494e 100644
--- 
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ 
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -179,7 +179,7 @@ public class CommonConfig {
   private long timePartitionOrigin = 0;
 
   /** Time partition interval in milliseconds. */
-  private long timePartitionInterval = 60_000;
+  private long timePartitionInterval = 604_800_000;
 
   /** This variable set timestamp precision as millisecond, microsecond or 
nanosecond. */
   private String timestampPrecision = "ms";
@@ -329,6 +329,7 @@ public class CommonConfig {
   private volatile double 
pipeThresholdAllocationStrategyFixedMemoryHighUsageThreshold = 0.8d;
   private volatile boolean pipeTransferTsFileSync = false;
   private volatile long pipeCheckAllSyncClientLiveTimeIntervalMs = 5 * 60 * 
1000L; // 5 minutes
+  private int pipeTsFileResourceSegmentLockNum = -1;
 
   private long twoStageAggregateMaxCombinerLiveTimeInMs = 8 * 60 * 1000L; // 8 
minutes
   private long twoStageAggregateDataRegionInfoCacheTimeInMs = 3 * 60 * 1000L; 
// 3 minutes
@@ -1942,14 +1943,28 @@ public class CommonConfig {
   }
 
   public void setPipeCheckAllSyncClientLiveTimeIntervalMs(
-      long pipeCheckSyncAllClientLiveTimeIntervalMs) {
-    if (this.pipeCheckAllSyncClientLiveTimeIntervalMs == 
pipeCheckSyncAllClientLiveTimeIntervalMs) {
+      long pipeCheckAllSyncClientLiveTimeIntervalMs) {
+    if (this.pipeCheckAllSyncClientLiveTimeIntervalMs == 
pipeCheckAllSyncClientLiveTimeIntervalMs) {
       return;
     }
-    this.pipeCheckAllSyncClientLiveTimeIntervalMs = 
pipeCheckSyncAllClientLiveTimeIntervalMs;
+    this.pipeCheckAllSyncClientLiveTimeIntervalMs = 
pipeCheckAllSyncClientLiveTimeIntervalMs;
     logger.info(
         "pipeCheckSyncAllClientLiveTimeIntervalMs is set to {}",
-        pipeCheckSyncAllClientLiveTimeIntervalMs);
+        pipeCheckAllSyncClientLiveTimeIntervalMs);
+  }
+
+  public int getPipeTsFileResourceSegmentLockNum() {
+    return pipeTsFileResourceSegmentLockNum;
+  }
+
+  public void setPipeTsFileResourceSegmentLockNum(int 
pipeTsFileResourceSegmentLockNum) {
+    if (this.pipeTsFileResourceSegmentLockNum == 
pipeTsFileResourceSegmentLockNum) {
+      return;
+    }
+    this.pipeTsFileResourceSegmentLockNum = pipeTsFileResourceSegmentLockNum;
+    logger.info(
+        "pipeCheckSyncAllClientLiveTimeIntervalMs is set to {}",
+        pipeCheckAllSyncClientLiveTimeIntervalMs);
   }
 
   public double getPipeSendTsFileRateLimitBytesPerSecond() {