[iotdb] branch master updated: Fix incompatible max_degree_of_index_node (#2962)

[chaow]

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

chaow 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 4afda52  Fix incompatible max_degree_of_index_node (#2962)
4afda52 is described below

commit 4afda529d7f8f230ecc7bacfb61e6327535902c7
Author: Zesong Sun <sz...@mails.tsinghua.edu.cn>
AuthorDate: Fri Apr 2 11:38:03 2021 +0800

    Fix incompatible max_degree_of_index_node (#2962)
---
 docs/UserGuide/Server/Config Manual.md                                  | 2 +-
 docs/zh/UserGuide/Server/Config Manual.md                               | 2 +-
 .../test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java   | 2 +-
 .../src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/UserGuide/Server/Config Manual.md 
b/docs/UserGuide/Server/Config Manual.md
index caadd32..9889493 100644
--- a/docs/UserGuide/Server/Config Manual.md    
+++ b/docs/UserGuide/Server/Config Manual.md    
@@ -147,7 +147,7 @@ The permission definitions are in 
${IOTDB\_CONF}/conf/jmx.access.
 |:---:|:---|
 |Description|The maximum degree of the metadata index tree (that is, the max 
number of each node's children)|
 |Type|Int32|
-|Default| 1024 |
+|Default| 256 |
 |Effective|Only allowed to be modified in first start up|
 
 * max\_string\_length
diff --git a/docs/zh/UserGuide/Server/Config Manual.md 
b/docs/zh/UserGuide/Server/Config Manual.md
index 0b5cd53..9465a17 100644
--- a/docs/zh/UserGuide/Server/Config Manual.md 
+++ b/docs/zh/UserGuide/Server/Config Manual.md 
@@ -118,7 +118,7 @@
 |:---:|:---|
 |描述|元数据索引树的最大度（即每个节点的最大子节点个数）|
 |类型|Int32|
-|默认值| 1024 |
+|默认值| 256 |
 |改后生效方式|仅允许在第一次启动服务器前修改|
 
 * max\_string\_length
diff --git 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
index 60b35bd..d9f56a6 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
@@ -84,7 +84,7 @@ public class IoTDBCheckConfigIT {
     systemProperties.put("timestamp_precision", "ms");
     systemProperties.put("tsfile_storage_fs", "LOCAL");
     systemProperties.put("enable_partition", "false");
-    systemProperties.put("max_degree_of_index_node", "1024");
+    systemProperties.put("max_degree_of_index_node", "256");
     systemProperties.put("tag_attribute_total_size", "700");
     systemProperties.put("iotdb_version", "0.11.2");
     systemProperties.put("virtual_storage_group_num", "1");
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 0eb96c2..08db1d1 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -74,7 +74,7 @@ public class TSFileConfig implements Serializable {
   private int pageSizeInByte = 64 * 1024;
   /** The maximum number of data points in a page, default value is 1024 * 
1024. */
   private int maxNumberOfPointsInPage = 1024 * 1024;
-  /** The maximum degree of a metadataIndex node, default value is 1024 */
+  /** The maximum degree of a metadataIndex node, default value is 256 */
   private int maxDegreeOfIndexNode = 256;
   /** Data type for input timestamp, TsFile supports INT32 or INT64. */
   private String timeSeriesDataType = "INT64";