This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch update_cluster_doc in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6f56dc861bab136a97d80caf60e07aef3b57db81 Merge: d67b95bc96 0eb5010414 Author: qiaojialin <[email protected]> AuthorDate: Mon Jun 27 15:21:43 2022 +0800 resolve conflict .github/workflows/sonar-coveralls.yml | 2 +- README.md | 4 +-- README_ZH.md | 4 +-- .../multileader/MultiLeaderConsensusTest.java | 3 ++- distribution/src/assembly/all.xml | 4 +-- distribution/src/assembly/server.xml | 4 +-- docker/src/main/Dockerfile-single | 2 +- docker/src/main/Dockerfile-single-influxdb | 4 +-- docker/src/main/Dockerfile-single-tc | 2 +- docs/Development/HowtoContributeCode.md | 4 +-- docs/UserGuide/API/Programming-MQTT.md | 8 +++--- docs/UserGuide/Data-Concept/Data-Type.md | 2 +- .../Data-Modeling/SchemaRegion-rocksdb.md | 2 +- .../Ecosystem Integration/Writing Data on HDFS.md | 2 +- docs/UserGuide/Maintenance-Tools/JMX-Tool.md | 2 +- .../Maintenance-Tools/Monitor-and-Log-Tools.md | 2 +- docs/UserGuide/Maintenance-Tools/Sync-Tool.md | 4 +-- docs/UserGuide/Maintenance-Tools/Watermark-Tool.md | 4 +-- .../Operate-Metadata/Auto-Create-MetaData.md | 28 ++++++++++---------- docs/UserGuide/Process-Data/Triggers.md | 2 +- .../Process-Data/UDF-User-Defined-Function.md | 2 +- docs/UserGuide/QuickStart/QuickStart.md | 10 ++++---- docs/UserGuide/QuickStart/ServerFileList.md | 4 +-- .../Write-And-Delete-Data/Load-External-Tsfile.md | 2 +- docs/zh/Development/HowtoContributeCode.md | 4 +-- docs/zh/UserGuide/API/Programming-MQTT.md | 6 ++--- docs/zh/UserGuide/Data-Concept/Data-Type.md | 2 +- .../Data-Modeling/SchemaRegion-rocksdb.md | 2 +- .../Ecosystem Integration/Writing Data on HDFS.md | 2 +- docs/zh/UserGuide/Maintenance-Tools/JMX-Tool.md | 2 +- .../Maintenance-Tools/Monitor-and-Log-Tools.md | 2 +- docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md | 6 ++--- .../UserGuide/Maintenance-Tools/Watermark-Tool.md | 4 +-- .../Operate-Metadata/Auto-Create-MetaData.md | 30 +++++++++++----------- docs/zh/UserGuide/Process-Data/Triggers.md | 2 +- .../Process-Data/UDF-User-Defined-Function.md | 2 +- docs/zh/UserGuide/QuickStart/QuickStart.md | 4 +-- docs/zh/UserGuide/QuickStart/ServerFileList.md | 4 +-- .../UserGuide/Reference/DataNode-Config-Manual.md | 3 +-- .../Write-And-Delete-Data/Load-External-Tsfile.md | 2 +- example/mqtt-customize/README.md | 4 +-- .../server/CustomizedJsonPayloadFormatter.java | 2 +- example/mqtt/README.md | 2 +- integration-test/pom.xml | 4 +-- integration-test/src/assembly/mpp-test.xml | 4 +-- .../org/apache/iotdb/it/env/DataNodeWrapper.java | 6 ++--- .../apache/iotdb/integration/env/ClusterNode.java | 4 +-- .../apache/iotdb/commons/conf/IoTDBConstant.java | 2 +- schema-engine-rocksdb/README.md | 2 +- .../resources/conf/schema-rocksdb.properties | 8 +++--- .../conf/{iotdb-env.bat => datanode-env.bat} | 2 +- .../conf/{iotdb-env.sh => datanode-env.sh} | 2 +- ...engine.properties => iotdb-datanode.properties} | 2 +- .../src/assembly/resources/sbin/start-datanode.bat | 14 +++++----- .../src/assembly/resources/sbin/start-datanode.sh | 14 +++++----- .../assembly/resources/sbin/start-new-server.bat | 6 ++--- .../assembly/resources/sbin/start-new-server.sh | 8 +++--- .../src/assembly/resources/sbin/start-server.bat | 6 ++--- server/src/assembly/resources/sbin/start-server.sh | 8 +++--- .../src/assembly/resources/sbin/stop-datanode.bat | 4 +-- server/src/assembly/resources/sbin/stop-server.bat | 4 +-- server/src/assembly/resources/sbin/stop-server.sh | 2 +- .../assembly/resources/tools/rocksdb-transfer.bat | 6 ++--- .../assembly/resources/tools/rocksdb-transfer.sh | 8 +++--- .../assembly/resources/tools/start-WalChecker.sh | 6 ++--- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 +++--- .../metadata/SeriesOverflowException.java | 2 +- .../exception/query/PathNumOverLimitException.java | 2 +- .../apache/iotdb/db/metadata/tag/TagLogFile.java | 2 +- .../org/apache/iotdb/db/script/EnvScriptIT.java | 8 +++--- ...engine.properties => iotdb-datanode.properties} | 0 ...engine.properties => iotdb-datanode.properties} | 0 ...engine.properties => iotdb-datanode.properties} | 0 ...engine.properties => iotdb-datanode.properties} | 0 .../java/org/apache/iotdb/db/sql/SingleNodeIT.java | 4 +-- .../iotdb/tsfile/common/conf/TSFileConfig.java | 2 +- 76 files changed, 171 insertions(+), 171 deletions(-) diff --cc docs/zh/UserGuide/Reference/DataNode-Config-Manual.md index 11205288f5,c283408a3e..45066a8270 --- a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md @@@ -83,12 -65,30 +83,11 @@@ IoTDB DataNode 与 Standalone 模式共 |默认值|31999| |改后生效方式|重启服务生效| -* MAX\_HEAP\_SIZE - -|名字|MAX\_HEAP\_SIZE| -|:---:|:---| -|描述|IoTDB 启动时能使用的最大堆内存大小。| -|类型|String| -|默认值|取决于操作系统和机器配置。在 Linux 或 MacOS 系统下默认为机器内存的四分之一。在 Windows 系统下，32 位系统的默认值是 512M，64 位系统默认值是 2G。| -|改后生效方式|重启服务生效| - -* HEAP\_NEWSIZE - -|名字|HEAP\_NEWSIZE| -|:---:|:---| -|描述|IoTDB 启动时能使用的最小堆内存大小。| -|类型|String| -|默认值|取决于操作系统和机器配置。在 Linux 或 MacOS 系统下默认值为机器 CPU 核数乘以 100M 的值与 MAX\_HEAP\_SIZE 四分之一这二者的最小值。在 Windows 系统下，32 位系统的默认值是 512M，64 位系统默认值是 2G。| -|改后生效方式|重启服务生效| - -## 系统配置项 +## 系统配置项（iotdb-datanode.properties） - 系统配置项是 IoTDB DataNode/Standalone 运行的核心配置，它主要用于设置 IoTDB DataNode/Standalone 文件层和引擎层的参数，便于用户根据自身需求调整 Server -系统配置项是 IoTDB Server 运行的核心配置，它主要用于设置 IoTDB Server 文件层和引擎层的参数，便于用户根据自身需求调整 Server --的相关配置，以达到较好的性能表现。系统配置项可分为两大模块：文件层配置项和引擎层配置项。用户可以通过`iotdb-datanode.properties`, 文件查看和修改两种配置项的内容。在 0.7.0 版本中字符串类型的配置项大小写敏感。 ++系统配置项是 IoTDB DataNode/Standalone 运行的核心配置，它主要用于设置 DataNode/Standalone 数据库引擎的参数。 -### RPC配置 +### 客户端 RPC 服务配置 * rpc\_address
