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 3062bdb623 rename iotdb-engine.properties to iotdb-datanode.properties
(#6449)
3062bdb623 is described below
commit 3062bdb6238c44b5814854eec015e9eaa5093c65
Author: Haonan <[email protected]>
AuthorDate: Sun Jun 26 23:05:45 2022 +0800
rename iotdb-engine.properties to iotdb-datanode.properties (#6449)
---
README.md | 2 +-
README_ZH.md | 2 +-
docker/src/main/Dockerfile-single-influxdb | 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 +-
.../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 | 4 +--
docs/UserGuide/QuickStart/ServerFileList.md | 2 +-
docs/UserGuide/Reference/Config-Manual.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 +-
.../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 | 2 +-
docs/zh/UserGuide/QuickStart/ServerFileList.md | 2 +-
docs/zh/UserGuide/Reference/Config-Manual.md | 8 +++---
.../Write-And-Delete-Data/Load-External-Tsfile.md | 2 +-
example/mqtt-customize/README.md | 4 +--
.../server/CustomizedJsonPayloadFormatter.java | 2 +-
example/mqtt/README.md | 2 +-
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +-
.../apache/iotdb/integration/env/ClusterNode.java | 4 +--
schema-engine-rocksdb/README.md | 2 +-
.../resources/conf/schema-rocksdb.properties | 8 +++---
...engine.properties => iotdb-datanode.properties} | 0
.../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 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 6 ++---
.../exception/query/PathNumOverLimitException.java | 2 +-
.../apache/iotdb/db/metadata/tag/TagLogFile.java | 2 +-
...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 +-
53 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/README.md b/README.md
index 928c85950c..712c9e907e 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ you run `mvn package` successfully.**
configuration files are under "conf" folder
* environment config module (`iotdb-env.bat`, `iotdb-env.sh`),
- * system config module (`iotdb-engine.properties`)
+ * system config module (`iotdb-datanode.properties`)
* log config module (`logback.xml`).
For more information, please see [Config
Manual](https://iotdb.apache.org/UserGuide/Master/Reference/Config-Manual.html).
diff --git a/README_ZH.md b/README_ZH.md
index 7831b88915..ab3adaeb31 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -165,7 +165,7 @@ git checkout vx.x.x
配置文件在"conf"文件夹下
* 环境配置模块(`iotdb-env.bat`, `iotdb-env.sh`),
-* 系统配置模块(`iotdb-engine.properties`)
+* 系统配置模块(`iotdb-datanode.properties`)
* 日志配置模块(`logback.xml`)。
有关详细信息，请参见[配置参数](https://iotdb.apache.org/zh/UserGuide/Master/Reference/Config-Manual.html)。
diff --git a/docker/src/main/Dockerfile-single-influxdb
b/docker/src/main/Dockerfile-single-influxdb
index b59bf93585..de18afab47 100644
--- a/docker/src/main/Dockerfile-single-influxdb
+++ b/docker/src/main/Dockerfile-single-influxdb
@@ -28,7 +28,7 @@ RUN apt update \
&& unzip /apache-iotdb-*-bin.zip -d / \
&& rm /apache-iotdb-*-bin.zip \
&& mv /apache-iotdb-* /iotdb \
- && sed -i '/^# enable_influxdb_rpc_service=false/a
enable_influxdb_rpc_service=true' /iotdb/sbin/../conf/iotdb-engine.properties \
+ && sed -i '/^# enable_influxdb_rpc_service=false/a
enable_influxdb_rpc_service=true' /iotdb/sbin/../conf/iotdb-datanode.properties
\
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
diff --git a/docs/Development/HowtoContributeCode.md
b/docs/Development/HowtoContributeCode.md
index 47b7024874..9e4d23cd4f 100644
--- a/docs/Development/HowtoContributeCode.md
+++ b/docs/Development/HowtoContributeCode.md
@@ -72,11 +72,11 @@ It is required to use "mvn spotless:apply" to format the
code before committing,
Notes
-1.The default values need to be consistent between iotdb-engine.properties
file and IoTDBConfig file.
+1.The default values need to be consistent between iotdb-datanode.properties
file and IoTDBConfig file.
2.To modify the configuration parameters, the following files need to be
modified
-a.Configuration file:
server/src/assembly/resources/conf/iotdb-engine.properties
+a.Configuration file:
server/src/assembly/resources/conf/iotdb-datanode.properties
b. Codes: IoTDBDescriptor, IoTDBConfig
diff --git a/docs/UserGuide/API/Programming-MQTT.md
b/docs/UserGuide/API/Programming-MQTT.md
index 5270dd1025..9e882edeb7 100644
--- a/docs/UserGuide/API/Programming-MQTT.md
+++ b/docs/UserGuide/API/Programming-MQTT.md
@@ -59,7 +59,7 @@ or json array of the above two.
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/6711230/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png";>
### MQTT Configurations
-The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-engine.properties` by default.
+The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties` by default.
Configurations are as follows:
@@ -157,7 +157,7 @@ public class CustomizedJsonPayloadFormatter implements
PayloadFormatter {
@Override
public String getName() {
- // set the value of mqtt_payload_formatter in iotdb-engine.properties
as the following string:
+ // set the value of mqtt_payload_formatter in
iotdb-datanode.properties as the following string:
return "CustomizedJson";
}
}
@@ -170,8 +170,8 @@ public class CustomizedJsonPayloadFormatter implements
PayloadFormatter {
Then, in your server:
* Create ${IOTDB_HOME}/ext/mqtt/ folder, and put the jar into this folder.
-* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
`conf/iotdb-engine.properties`)
-* Set the value of `mqtt_payload_formatter` in `conf/iotdb-engine.properties`
as the value of getName() in your implementation
+* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
`conf/iotdb-datanode.properties`)
+* Set the value of `mqtt_payload_formatter` in
`conf/iotdb-datanode.properties` as the value of getName() in your
implementation
, in this example, the value is `CustomizedJson`
* Launch the IoTDB server.
* Now IoTDB will use your implementation to parse the MQTT message.
diff --git a/docs/UserGuide/Data-Concept/Data-Type.md
b/docs/UserGuide/Data-Concept/Data-Type.md
index 4184be50d8..218933b9a9 100644
--- a/docs/UserGuide/Data-Concept/Data-Type.md
+++ b/docs/UserGuide/Data-Concept/Data-Type.md
@@ -33,7 +33,7 @@ IoTDB supports the following data types:
* TEXT (String)
-The time series of **FLOAT** and **DOUBLE** type can specify
(MAX\_POINT\_NUMBER, see [this page](../Reference/SQL-Reference.md) for more
information on how to specify), which is the number of digits after the decimal
point of the floating point number, if the encoding method is
[RLE](Encoding.md) or [TS\_2DIFF](Encoding.md). If MAX\_POINT\_NUMBER is not
specified, the system will use
[float\_precision](../Reference/Config-Manual.md) in the configuration file
`iotdb-engine.properties`.
+The time series of **FLOAT** and **DOUBLE** type can specify
(MAX\_POINT\_NUMBER, see [this page](../Reference/SQL-Reference.md) for more
information on how to specify), which is the number of digits after the decimal
point of the floating point number, if the encoding method is
[RLE](Encoding.md) or [TS\_2DIFF](Encoding.md). If MAX\_POINT\_NUMBER is not
specified, the system will use
[float\_precision](../Reference/Config-Manual.md) in the configuration file
`iotdb-datanode.properties`.
* For Float data value, The data range is (-Integer.MAX_VALUE,
Integer.MAX_VALUE), rather than Float.MAX_VALUE, and the max_point_number is
19, caused by the limition of function Math.round(float) in Java.
* For Double data value, The data range is (-Long.MAX_VALUE, Long.MAX_VALUE),
rather than Double.MAX_VALUE, and the max_point_number is 19, caused by the
limition of function Math.round(double) in Java (Long.MAX_VALUE=9.22E18).
diff --git a/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
b/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
index 4aca0fdaab..d1f71ac012 100644
--- a/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
+++ b/docs/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
@@ -37,7 +37,7 @@ After that, you can get a **conf** directory and a **lib**
directory in
schema-engine-rocksdb/target/schema-engine-rocksdb. Copy the file in the conf
directory to the conf directory of server,
and copy the files in the lib directory to the lib directory of server.
-Then, open the **iotdb-engine.properties** in the conf directory of server,
and set the `schema_engine_mode` to
+Then, open the **iotdb-datanode.properties** in the conf directory of server,
and set the `schema_engine_mode` to
Rocksdb_based. Restart the IoTDB, the system will use `RSchemaRegion` to
manage the metadata.
```
diff --git a/docs/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
b/docs/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
index 57f371d79b..9d0cffb1ca 100644
--- a/docs/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
+++ b/docs/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
@@ -41,7 +41,7 @@ Build server and Hadoop module by: `mvn clean package -pl
server,hadoop -am -Dma
Then, copy the target jar of Hadoop module
`hadoop-tsfile-X.X.X-jar-with-dependencies.jar` into server target lib folder
`.../server/target/iotdb-server-X.X.X/lib`.
-Edit user config in `iotdb-engine.properties`. Related configurations are:
+Edit user config in `iotdb-datanode.properties`. Related configurations are:
* tsfile\_storage\_fs
diff --git a/docs/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
b/docs/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
index 18e2d2c175..9d71eb479c 100644
--- a/docs/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
+++ b/docs/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
@@ -49,7 +49,7 @@ To grasp the performance of iotdb, this module is added to
count the time-consum
#### Configuration parameter
-location：conf/iotdb-engine.properties
+location：conf/iotdb-datanode.properties
<center>
diff --git a/docs/UserGuide/Maintenance-Tools/Sync-Tool.md
b/docs/UserGuide/Maintenance-Tools/Sync-Tool.md
index 7d484a329e..937fa9425c 100644
--- a/docs/UserGuide/Maintenance-Tools/Sync-Tool.md
+++ b/docs/UserGuide/Maintenance-Tools/Sync-Tool.md
@@ -287,7 +287,7 @@ IoTDB> SHOW PIPESERVER STATUS
##### **Receiver**
-- `vi conf/iotdb-engine.properties` to config the parameters，set the IP white
list to 192.168.0.1/1 to receive and only receive data from sender.
+- `vi conf/iotdb-datanode.properties` to config the parameters，set the IP
white list to 192.168.0.1/1 to receive and only receive data from sender.
```
####################
@@ -420,7 +420,7 @@ It costs 0.134s
```
- Cause by: The receiver is not started or the receiver cannot be connected.
- - Solution: Execute `SHOW PIPESERVER` on the receiver side to check if the
receiver side is started, if not use `START PIPESERVER` to start; check if the
whitelist in `iotdb-engine.properties` on the receiver side contains the sender
ip.
+ - Solution: Execute `SHOW PIPESERVER` on the receiver side to check if the
receiver side is started, if not use `START PIPESERVER` to start; check if the
whitelist in `iotdb-datanode.properties` on the receiver side contains the
sender ip.
- Execute
diff --git a/docs/UserGuide/Maintenance-Tools/Watermark-Tool.md
b/docs/UserGuide/Maintenance-Tools/Watermark-Tool.md
index e530435df6..02a1204288 100644
--- a/docs/UserGuide/Maintenance-Tools/Watermark-Tool.md
+++ b/docs/UserGuide/Maintenance-Tools/Watermark-Tool.md
@@ -25,7 +25,7 @@ This tool has two functions: 1) watermark embedding of the
IoTDB query result an
#### Configuration
-Watermark is disabled by default in IoTDB. To enable watermark embedding, the
first thing is to modify the following fields in the configuration file
`iotdb-engine.properties`:
+Watermark is disabled by default in IoTDB. To enable watermark embedding, the
first thing is to modify the following fields in the configuration file
`iotdb-datanode.properties`:
| Name | Example
| Explanation |
| ----------------------- |
------------------------------------------------------ |
------------------------------------------------------------ |
@@ -43,7 +43,7 @@ Notes:
- Both of them should be positive integers.
- `embed_row_cycle` controls the ratio of rows watermarked. The smaller the
`embed_row_cycle`, the larger the ratio of rows watermarked. When
`embed_row_cycle` equals 1, every row is watermarked.
- GroupBasedLSBMethod uses LSB embedding. `embed_lsb_num` controls the
number of least significant bits available for watermark embedding. The biggger
the `embed_lsb_num`, the larger the varying range of a data point.
-- `watermark_secret_key`, `watermark_bit_string` and `watermark_method`
should be kept secret from possible attackers. That is, it is your
responsiblity to take care of `iotdb-engine.properties`.
+- `watermark_secret_key`, `watermark_bit_string` and `watermark_method`
should be kept secret from possible attackers. That is, it is your
responsiblity to take care of `iotdb-datanode.properties`.
#### Usage Example
diff --git a/docs/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
b/docs/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
index 9ea5bdbb5d..dbc303c4d1 100644
--- a/docs/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
+++ b/docs/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
@@ -83,14 +83,14 @@ Illustrated as the following figure:
### Type inference
-| Data(String Format) | Format Type | iotdb-engine.properties | Default |
-|:---:|:---|:---|:---|
-| true | boolean | boolean\_string\_infer\_type | BOOLEAN |
-| 1 | integer | integer\_string\_infer\_type | FLOAT |
-| 17000000（integer > 2^24） | integer | long\_string\_infer\_type | DOUBLE |
+| Data(String Format) | Format Type | iotdb-datanode.properties | Default |
+|:---:|:---|:------------------------------|:---|
+| true | boolean | boolean\_string\_infer\_type | BOOLEAN |
+| 1 | integer | integer\_string\_infer\_type | FLOAT |
+| 17000000（integer > 2^24） | integer | long\_string\_infer\_type | DOUBLE |
| 1.2 | floating | floating\_string\_infer\_type | FLOAT |
-| NaN | nan | nan\_string\_infer\_type | DOUBLE |
-| 'I am text' | text | x | x |
+| NaN | nan | nan\_string\_infer\_type | DOUBLE |
+| 'I am text' | text | x | x |
* Data types can be configured as BOOLEAN, INT32, INT64, FLOAT, DOUBLE, TEXT.
@@ -98,14 +98,14 @@ Illustrated as the following figure:
### Encoding Type
-| Data Type | iotdb-engine.properties | Default |
-|:---|:---|:---|
+| Data Type | iotdb-datanode.properties | Default |
+|:---|:---------------------------|:---|
| BOOLEAN | default\_boolean\_encoding | RLE |
-| INT32 | default\_int32\_encoding | RLE |
-| INT64 | default\_int64\_encoding | RLE |
-| FLOAT | default\_float\_encoding | GORILLA |
-| DOUBLE | default\_double\_encoding | GORILLA |
-| TEXT | default\_text\_encoding | PLAIN |
+| INT32 | default\_int32\_encoding | RLE |
+| INT64 | default\_int64\_encoding | RLE |
+| FLOAT | default\_float\_encoding | GORILLA |
+| DOUBLE | default\_double\_encoding | GORILLA |
+| TEXT | default\_text\_encoding | PLAIN |
* Encoding types can be configured as PLAIN, RLE, TS_2DIFF, GORILLA,
DICTIONARY.
diff --git a/docs/UserGuide/Process-Data/Triggers.md
b/docs/UserGuide/Process-Data/Triggers.md
index 8f185e2aec..950aa50b4c 100644
--- a/docs/UserGuide/Process-Data/Triggers.md
+++ b/docs/UserGuide/Process-Data/Triggers.md
@@ -913,7 +913,7 @@ public class TriggerExample implements Trigger {
You can try this trigger by following the steps below:
-* Enable MQTT service by modifying `iotdb-engine.properties`
+* Enable MQTT service by modifying `iotdb-datanode.properties`
``` properties
# whether to enable the mqtt service.
diff --git a/docs/UserGuide/Process-Data/UDF-User-Defined-Function.md
b/docs/UserGuide/Process-Data/UDF-User-Defined-Function.md
index 4c8f7d2105..9c1dd6f58e 100644
--- a/docs/UserGuide/Process-Data/UDF-User-Defined-Function.md
+++ b/docs/UserGuide/Process-Data/UDF-User-Defined-Function.md
@@ -512,7 +512,7 @@ For more user permissions related content, please refer to
[Account Management S
## Configurable Properties
-When querying by a UDF, IoTDB may prompt that there is insufficient memory.
You can resolve the issue by configuring
`udf_initial_byte_array_length_for_memory_control`, `udf_memory_budget_in_mb`
and `udf_reader_transformer_collector_memory_proportion` in
`iotdb-engine.properties` and restarting the server.
+When querying by a UDF, IoTDB may prompt that there is insufficient memory.
You can resolve the issue by configuring
`udf_initial_byte_array_length_for_memory_control`, `udf_memory_budget_in_mb`
and `udf_reader_transformer_collector_memory_proportion` in
`iotdb-datanode.properties` and restarting the server.
diff --git a/docs/UserGuide/QuickStart/QuickStart.md
b/docs/UserGuide/QuickStart/QuickStart.md
index 103587bd06..90e2dbef28 100644
--- a/docs/UserGuide/QuickStart/QuickStart.md
+++ b/docs/UserGuide/QuickStart/QuickStart.md
@@ -49,7 +49,7 @@ You can download the binary file from:
configuration files are under "conf" folder
* environment config module (`iotdb-env.bat`, `iotdb-env.sh`),
- * system config module (`iotdb-engine.properties`)
+ * system config module (`iotdb-datanode.properties`)
* log config module (`logback.xml`).
For more, see [Config](../Reference/Config-Manual.md) in detail.
@@ -235,5 +235,5 @@ The server can be stopped with ctrl-C or the following
script:
The configuration files is in the `conf` folder, includes:
* environment configuration (`iotdb-env.bat`, `iotdb-env.sh`),
-* system configuration (`iotdb-engine.properties`)
+* system configuration (`iotdb-datanode.properties`)
* log configuration (`logback.xml`).
\ No newline at end of file
diff --git a/docs/UserGuide/QuickStart/ServerFileList.md
b/docs/UserGuide/QuickStart/ServerFileList.md
index 8f0f425fdb..1fce7a22b8 100644
--- a/docs/UserGuide/QuickStart/ServerFileList.md
+++ b/docs/UserGuide/QuickStart/ServerFileList.md
@@ -27,7 +27,7 @@
## Configuration Files
> under conf directory
-1. iotdb-engine.properties
+1. iotdb-datanode.properties
2. logback.xml
3. iotdb-env.sh
4. jmx.access
diff --git a/docs/UserGuide/Reference/Config-Manual.md
b/docs/UserGuide/Reference/Config-Manual.md
index 338a109190..b371181c39 100644
--- a/docs/UserGuide/Reference/Config-Manual.md
+++ b/docs/UserGuide/Reference/Config-Manual.md
@@ -27,8 +27,8 @@ Before starting to use IoTDB, you need to config the
configuration files first.
In total, we provide users three kinds of configurations module:
* environment configuration file (`iotdb-env.bat`, `iotdb-env.sh`). The
default configuration file for the environment configuration item. Users can
configure the relevant system configuration items of JAVA-JVM in the file.
-* system configuration file (`iotdb-engine.properties`).
- * `iotdb-engine.properties`: The default configuration file for the
IoTDB engine layer configuration item. Users can configure the IoTDB engine
related parameters in the file, such as JDBC service listening port
(`rpc_port`), unsequence data storage directory (`unsequence_data_dir`), etc.
What's more, Users can configure the information about the TsFile, such as the
data size written to the disk per time(`group_size_in_byte`).
+* system configuration file (`iotdb-datanode.properties`).
+ * `iotdb-datanode.properties`: The default configuration file for the
IoTDB engine layer configuration item. Users can configure the IoTDB engine
related parameters in the file, such as JDBC service listening port
(`rpc_port`), unsequence data storage directory (`unsequence_data_dir`), etc.
What's more, Users can configure the information about the TsFile, such as the
data size written to the disk per time(`group_size_in_byte`).
* log configuration file (`logback.xml`)
diff --git a/docs/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
b/docs/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
index 53390d431d..98748163a9 100644
--- a/docs/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
+++ b/docs/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
@@ -41,7 +41,7 @@ The second parameter indicates the path of the tsfile to be
loaded and the name
AUTOREGISTER option. If the metadata correspond to the timeseries in the
tsfile to be loaded does not exist, you can choose whether to create the schema
automatically. If this parameter is true, the schema is created automatically.
If it is false, the schema will not be created. By default, the schema will be
created.
-SGLEVEL option. If the storage group correspond to the tsfile does not exist,
the user can set the level of storage group through the fourth parameter. By
default, it uses the storage group level which is set in
`iotdb-engine.properties`.
+SGLEVEL option. If the storage group correspond to the tsfile does not exist,
the user can set the level of storage group through the fourth parameter. By
default, it uses the storage group level which is set in
`iotdb-datanode.properties`.
VERIFY option. If this parameter is true, All timeseries in this loading
tsfile will be compared with the timeseries in IoTDB. If existing a measurement
which has different datatype with the measurement in IoTDB, the loading process
will be stopped and exit. If consistence can be promised, setting false for
this parameter will be a better choice.
diff --git a/docs/zh/Development/HowtoContributeCode.md
b/docs/zh/Development/HowtoContributeCode.md
index 22494b13d0..424b55252b 100644
--- a/docs/zh/Development/HowtoContributeCode.md
+++ b/docs/zh/Development/HowtoContributeCode.md
@@ -72,10 +72,10 @@ master 分支作为当前主开发分支，对应下一个未发布的大版本
注意事项:
-iotdb-engine.properties 和 IoTDBConfig 默认值需要保持一致。
+iotdb-datanode.properties 和 IoTDBConfig 默认值需要保持一致。
如果需要对配置参数进行改动。以下文件需要同时修改：
- 1. 配置文件：server/src/assembly/resources/conf/iotdb-engine.properties
+ 1. 配置文件：server/src/assembly/resources/conf/iotdb-datanode.properties
2. 代码：IoTDBDescriptor、IoTDBConfig
3.
文档：docs/UserGuide/Reference/Config-Manual.md、docs/zh/UserGuide/Reference/Config-Manual.md
diff --git a/docs/zh/UserGuide/API/Programming-MQTT.md
b/docs/zh/UserGuide/API/Programming-MQTT.md
index 4c832b3684..098fc3d961 100644
--- a/docs/zh/UserGuide/API/Programming-MQTT.md
+++ b/docs/zh/UserGuide/API/Programming-MQTT.md
@@ -156,7 +156,7 @@ public class CustomizedJsonPayloadFormatter implements
PayloadFormatter {
@Override
public String getName() {
- // set the value of mqtt_payload_formatter in iotdb-engine.properties
as the following string:
+ // set the value of mqtt_payload_formatter in
iotdb-datanode.properties as the following string:
return "CustomizedJson";
}
}
@@ -169,8 +169,8 @@ public class CustomizedJsonPayloadFormatter implements
PayloadFormatter {
在 IoTDB 服务端:
* 创建 ${IOTDB_HOME}/ext/mqtt/ 文件夹, 将刚才的 jar 包放入此文件夹。
-* 打开 MQTT 服务参数. (`enable_mqtt_service=true` in `conf/iotdb-engine.properties`)
-* 用刚才的实现类中的 getName() 方法的返回值 设置为 `conf/iotdb-engine.properties` 中
`mqtt_payload_formatter` 的值，
+* 打开 MQTT 服务参数. (`enable_mqtt_service=true` in
`conf/iotdb-datanode.properties`)
+* 用刚才的实现类中的 getName() 方法的返回值 设置为 `conf/iotdb-datanode.properties` 中
`mqtt_payload_formatter` 的值，
, 在本例中，为 `CustomizedJson`
* 启动 IoTDB
* 搞定.
diff --git a/docs/zh/UserGuide/Data-Concept/Data-Type.md
b/docs/zh/UserGuide/Data-Concept/Data-Type.md
index 5b81baa08c..19b9af6f0f 100644
--- a/docs/zh/UserGuide/Data-Concept/Data-Type.md
+++ b/docs/zh/UserGuide/Data-Concept/Data-Type.md
@@ -34,7 +34,7 @@ IoTDB 支持：
一共六种数据类型。
-其中 **FLOAT** 与 **DOUBLE** 类型的序列，如果编码方式采用 [RLE](Encoding.md) 或
[TS_2DIFF](Encoding.md) 可以指定
MAX_POINT_NUMBER，该项为浮点数的小数点后位数，若不指定则系统会根据配置文件`iotdb-engine.properties`文件中的
[float_precision 项](../Reference/Config-Manual.md) 配置。
+其中 **FLOAT** 与 **DOUBLE** 类型的序列，如果编码方式采用 [RLE](Encoding.md) 或
[TS_2DIFF](Encoding.md) 可以指定
MAX_POINT_NUMBER，该项为浮点数的小数点后位数，若不指定则系统会根据配置文件`iotdb-datanode.properties`文件中的
[float_precision 项](../Reference/Config-Manual.md) 配置。
当系统中用户输入的数据类型与该时间序列的数据类型不对应时，系统会提醒类型错误，如下所示，二阶差分编码不支持布尔类型：
diff --git a/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
b/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
index 413bd3d3b7..8a267f237c 100644
--- a/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
+++ b/docs/zh/UserGuide/Data-Modeling/SchemaRegion-rocksdb.md
@@ -34,7 +34,7 @@ mvn clean package -pl schema-engine-rocksdb -am -DskipTests
命令运行结束后，在其 target/schema-engine-rocksdb 中会有一个 lib 文件夹和 conf 文件夹。将 conf
文件夹下的文件拷贝到 server 的 conf 文件夹中，将 lib 文件夹下的文件也拷贝到
server 的 lib 的文件夹中。
-在系统配置文件`iotdb-engine.properties`中，将配置项`schema_engine_mode`修改为`Rocksdb_based`，
如：
+在系统配置文件`iotdb-datanode.properties`中，将配置项`schema_engine_mode`修改为`Rocksdb_based`，
如：
```
####################
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
b/docs/zh/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
index 741a038862..44dc57341f 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Writing Data on HDFS.md
@@ -41,7 +41,7 @@
然后，将 Hadoop 模块的 target jar 包`hadoop-tsfile-X.X.X-jar-with-dependencies.jar`复制到
server 模块的 target lib 文件夹 `.../server/target/iotdb-server-X.X.X/lib`下。
-编辑`iotdb-engine.properties`中的用户配置。相关配置项包括：
+编辑`iotdb-datanode.properties`中的用户配置。相关配置项包括：
* tsfile\_storage\_fs
diff --git a/docs/zh/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
b/docs/zh/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
index 3e90ceefbd..49eca9d4e8 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/Monitor-and-Log-Tools.md
@@ -49,7 +49,7 @@
#### 配置参数
-配置文件位置：conf/iotdb-engine.properties
+配置文件位置：conf/iotdb-datanode.properties
<center>
diff --git a/docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md
b/docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md
index b261531660..7ca0492ea2 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/Sync-Tool.md
@@ -116,7 +116,7 @@ IoTDB> DROP PIPE my_pipe
## 5.配置参数
-所有参数修改均在`$IOTDB_HOME$/conf/iotdb-engine.properties`中，所有修改完成之后执行`load
configuration`之后即可立刻生效。
+所有参数修改均在`$IOTDB_HOME$/conf/iotdb-datanode.properties`中，所有修改完成之后执行`load
configuration`之后即可立刻生效。
#### 5.1发送端相关
@@ -292,7 +292,7 @@ IoTDB> SHOW PIPESERVER
#### **接收端操作**
-- `vi conf/iotdb-engine.properties` 配置云端参数，将白名单设置为仅接收来自IP为 192.168.0.1的边端的数据
+- `vi conf/iotdb-datanode.properties` 配置云端参数，将白名单设置为仅接收来自IP为 192.168.0.1的边端的数据
```
####################
@@ -426,7 +426,7 @@ It costs 0.134s
```
- 原因：接收端未启动或接收端无法连接
- - 解决方案：在接收端执行 `SHOW PIPESERVER` 检查是否启动接收端，若未启动使用 `START PIPESERVER`
启动；检查接收端`iotdb-engine.properties`中的白名单是否包含发送端ip。
+ - 解决方案：在接收端执行 `SHOW PIPESERVER` 检查是否启动接收端，若未启动使用 `START PIPESERVER`
启动；检查接收端`iotdb-datanode.properties`中的白名单是否包含发送端ip。
- 执行
diff --git a/docs/zh/UserGuide/Maintenance-Tools/Watermark-Tool.md
b/docs/zh/UserGuide/Maintenance-Tools/Watermark-Tool.md
index b944545e48..e1fbb7bd7b 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/Watermark-Tool.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/Watermark-Tool.md
@@ -25,7 +25,7 @@ under the License.
#### 配置
-IoTDB 默认关闭水印嵌入功能。为了使用这个功能，第一步要做的事情是修改配置文件`iotdb-engine.properties`中的以下各项：
+IoTDB 默认关闭水印嵌入功能。为了使用这个功能，第一步要做的事情是修改配置文件`iotdb-datanode.properties`中的以下各项：
| 名称 | 示例
| 解释 |
| ----------------------- |
------------------------------------------------------ |
----------------------------------- |
@@ -43,7 +43,7 @@ IoTDB 默认关闭水印嵌入功能。为了使用这个功能，第一步要
- 均是正整数
-
`embed_row_cycle`控制了被嵌入水印的行占总行数的比例。`embed_row_cycle`越小，被嵌入水印的行的比例就越大。当`embed_row_cycle`等于
1 的时候，所有的行都将嵌入水印。
- GroupBasedLSBMethod 使用 LSB
嵌入。`embed_lsb_num`控制了允许嵌入水印的最低有效位的数量。`embed_lsb_num`越大，数值的可变化范围就越大。
-- `watermark_secret_key`,
`watermark_bit_string`和`watermark_method`都不应该被攻击者获得。您需要自己负责配置文件`iotdb-engine.properties`的安全管理。
+- `watermark_secret_key`,
`watermark_bit_string`和`watermark_method`都不应该被攻击者获得。您需要自己负责配置文件`iotdb-datanode.properties`的安全管理。
#### 使用示例
diff --git a/docs/zh/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
b/docs/zh/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
index 9e2a99c7e3..edd60a0066 100644
--- a/docs/zh/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
+++ b/docs/zh/UserGuide/Operate-Metadata/Auto-Create-MetaData.md
@@ -82,14 +82,14 @@
### 类型推断
-| 数据(String) | 字符串格式 | iotdb-engine.properties配置项 | 默认值 |
-|:---:|:---|:---|:---|
-| true | boolean | boolean\_string\_infer\_type | BOOLEAN |
-| 1 | integer | integer\_string\_infer\_type | FLOAT |
-| 17000000（大于 2^24 的整数） | integer | long\_string\_infer\_type | DOUBLE |
+| 数据(String) | 字符串格式 | iotdb-datanode.properties配置项 | 默认值 |
+|:---:|:---|:------------------------------|:---|
+| true | boolean | boolean\_string\_infer\_type | BOOLEAN |
+| 1 | integer | integer\_string\_infer\_type | FLOAT |
+| 17000000（大于 2^24 的整数） | integer | long\_string\_infer\_type | DOUBLE |
| 1.2 | floating | floating\_string\_infer\_type | FLOAT |
-| NaN | nan | nan\_string\_infer\_type | DOUBLE |
-| 'I am text' | text | 无 | 无 |
+| NaN | nan | nan\_string\_infer\_type | DOUBLE |
+| 'I am text' | text | 无 | 无 |
* 可配置的数据类型包括：BOOLEAN, INT32, INT64, FLOAT, DOUBLE, TEXT
@@ -97,14 +97,14 @@
### 编码方式
-| 数据类型 | iotdb-engine.properties配置项 | 默认值 |
-|:---|:---|:---|
-| BOOLEAN | default\_boolean\_encoding | RLE |
-| INT32 | default\_int32\_encoding | RLE |
-| INT64 | default\_int64\_encoding | RLE |
-| FLOAT | default\_float\_encoding | GORILLA |
-| DOUBLE | default\_double\_encoding | GORILLA |
-| TEXT | default\_text\_encoding | PLAIN |
+| 数据类型 | iotdb-datanode.properties配置项 | 默认值 |
+|:---|:-----------------------------|:---|
+| BOOLEAN | default\_boolean\_encoding | RLE |
+| INT32 | default\_int32\_encoding | RLE |
+| INT64 | default\_int64\_encoding | RLE |
+| FLOAT | default\_float\_encoding | GORILLA |
+| DOUBLE | default\_double\_encoding | GORILLA |
+| TEXT | default\_text\_encoding | PLAIN |
* 可配置的编码方式包括：PLAIN, RLE, TS_2DIFF, GORILLA, DICTIONARY
diff --git a/docs/zh/UserGuide/Process-Data/Triggers.md
b/docs/zh/UserGuide/Process-Data/Triggers.md
index 18afebf9fc..5413f81766 100644
--- a/docs/zh/UserGuide/Process-Data/Triggers.md
+++ b/docs/zh/UserGuide/Process-Data/Triggers.md
@@ -851,7 +851,7 @@ public class TriggerExample implements Trigger {
您可以按照下面的步骤试用这个触发器：
-* 在`iotdb-engine.properties`中启用 MQTT 服务
+* 在`iotdb-datanode.properties`中启用 MQTT 服务
``` properties
# whether to enable the mqtt service.
diff --git a/docs/zh/UserGuide/Process-Data/UDF-User-Defined-Function.md
b/docs/zh/UserGuide/Process-Data/UDF-User-Defined-Function.md
index 7eec172410..c789b3a597 100644
--- a/docs/zh/UserGuide/Process-Data/UDF-User-Defined-Function.md
+++ b/docs/zh/UserGuide/Process-Data/UDF-User-Defined-Function.md
@@ -452,7 +452,7 @@ SHOW FUNCTIONS
## 配置项
-在 SQL
语句中使用自定义函数时，可能提示内存不足。这种情况下，您可以通过更改配置文件`iotdb-engine.properties`中的`udf_initial_byte_array_length_for_memory_control`，`udf_memory_budget_in_mb`和`udf_reader_transformer_collector_memory_proportion`并重启服务来解决此问题。
+在 SQL
语句中使用自定义函数时，可能提示内存不足。这种情况下，您可以通过更改配置文件`iotdb-datanode.properties`中的`udf_initial_byte_array_length_for_memory_control`，`udf_memory_budget_in_mb`和`udf_reader_transformer_collector_memory_proportion`并重启服务来解决此问题。
## 贡献 UDF
diff --git a/docs/zh/UserGuide/QuickStart/QuickStart.md
b/docs/zh/UserGuide/QuickStart/QuickStart.md
index 983766d6da..bcc156df93 100644
--- a/docs/zh/UserGuide/QuickStart/QuickStart.md
+++ b/docs/zh/UserGuide/QuickStart/QuickStart.md
@@ -259,5 +259,5 @@ Windows 系统停止命令如下：
配置文件在"conf"文件夹下，包括：
* 环境配置模块 (`iotdb-env.bat`, `iotdb-env.sh`),
- * 系统配置模块 (`iotdb-engine.properties`)
+ * 系统配置模块 (`iotdb-datanode.properties`)
* 日志配置模块 (`logback.xml`).
diff --git a/docs/zh/UserGuide/QuickStart/ServerFileList.md
b/docs/zh/UserGuide/QuickStart/ServerFileList.md
index 4c097263eb..c3f543f692 100644
--- a/docs/zh/UserGuide/QuickStart/ServerFileList.md
+++ b/docs/zh/UserGuide/QuickStart/ServerFileList.md
@@ -27,7 +27,7 @@
## 配置文件
> conf 目录下
-1. iotdb-engine.properties
+1. iotdb-datanode.properties
2. logback.xml
3. iotdb-env.sh
4. jmx.access
diff --git a/docs/zh/UserGuide/Reference/Config-Manual.md
b/docs/zh/UserGuide/Reference/Config-Manual.md
index 92dbc78a80..a68381ee1f 100644
--- a/docs/zh/UserGuide/Reference/Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/Config-Manual.md
@@ -23,20 +23,20 @@
为方便 IoTDB Server 的配置与管理，IoTDB Server 为用户提供三种配置项，使得用户可以在启动服务或服务运行时对其进行配置。
-三种配置项的配置文件均位于 IoTDB 安装目录：`$IOTDB_HOME/conf`文件夹下，其中涉及 server 配置的共有 2
个文件，分别为：`iotdb-env.sh`, `iotdb-engine.properties`
+三种配置项的配置文件均位于 IoTDB 安装目录：`$IOTDB_HOME/conf`文件夹下，其中涉及 server 配置的共有 2
个文件，分别为：`iotdb-env.sh`, `iotdb-datanode.properties`
。用户可以通过更改其中的配置项对系统运行的相关配置项进行配置。
配置文件的说明如下：
* `iotdb-env.sh`：环境配置项的默认配置文件。用户可以在文件中配置 JAVA-JVM 的相关系统配置项。
-* `iotdb-engine.properties`：IoTDB 引擎层系统配置项的默认配置文件。用户可以在文件中配置 IoTDB
引擎运行时的相关参数，如 JDBC 服务监听端口 (`rpc_port`)、overflow
+* `iotdb-datanode.properties`：IoTDB 引擎层系统配置项的默认配置文件。用户可以在文件中配置 IoTDB
引擎运行时的相关参数，如 JDBC 服务监听端口 (`rpc_port`)、overflow
数据文件存储目录 (`overflow_data_dir`) 等。此外，用户可以在文件中配置 IoTDB 存储时 TsFile
文件的相关信息，如每次将内存中的数据写入到磁盘时的数据大小 (`group_size_in_byte`)
，内存中每个列打一次包的大小 (`page_size_in_byte`) 等。
## 热修改配置项
-为方便用户使用，IoTDB Server
为用户提供了热修改功能，即在系统运行过程中修改`iotdb-engine.properties`中部分配置参数并即时应用到系统中。下面介绍的参数中，改后
生效方式为`触发生效`
+为方便用户使用，IoTDB Server
为用户提供了热修改功能，即在系统运行过程中修改`iotdb-datanode.properties`中部分配置参数并即时应用到系统中。下面介绍的参数中，改后
生效方式为`触发生效`
的均为支持热修改的配置参数。
触发方式：客户端发送```load configuration```命令至 IoTDB
@@ -86,7 +86,7 @@ Server，客户端的使用方式详见 [SQL 命令行终端（CLI）](https://i
## 系统配置项
系统配置项是 IoTDB Server 运行的核心配置，它主要用于设置 IoTDB Server 文件层和引擎层的参数，便于用户根据自身需求调整 Server
-的相关配置，以达到较好的性能表现。系统配置项可分为两大模块：文件层配置项和引擎层配置项。用户可以通过`iotdb-engine.properties`,
文件查看和修改两种配置项的内容。在 0.7.0 版本中字符串类型的配置项大小写敏感。
+的相关配置，以达到较好的性能表现。系统配置项可分为两大模块：文件层配置项和引擎层配置项。用户可以通过`iotdb-datanode.properties`,
文件查看和修改两种配置项的内容。在 0.7.0 版本中字符串类型的配置项大小写敏感。
### RPC配置
diff --git a/docs/zh/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
b/docs/zh/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
index 3bf30d8b0e..34a7e0f1f7 100644
--- a/docs/zh/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
+++ b/docs/zh/UserGuide/Write-And-Delete-Data/Load-External-Tsfile.md
@@ -39,7 +39,7 @@
AUTOREGISTER 选项表示当待加载的 tsfile 文件中时间序列对应的元数据不存在时，用户可以选择是否自动创建 schema ，参数为 true
表示自动创建 schema，相反 false 表示不创建，缺省时默认创建 schema。
-SGLEVEL 选项，当 tsfile 对应的存储组不存在时，用户可以通过 sglevel
参数的值来制定存储组的级别，默认为`iotdb-engine.properties`中设置的级别。例如当设置 level 参数为1时表明此 tsfile
中所有时间序列中层级为1的前缀路径是存储组，即若存在设备 root.sg.d1.s1，此时 root.sg 被指定为存储组。
+SGLEVEL 选项，当 tsfile 对应的存储组不存在时，用户可以通过 sglevel
参数的值来制定存储组的级别，默认为`iotdb-datanode.properties`中设置的级别。例如当设置 level 参数为1时表明此 tsfile
中所有时间序列中层级为1的前缀路径是存储组，即若存在设备 root.sg.d1.s1，此时 root.sg 被指定为存储组。
VERIFY 选项表示是否对载入的 tsfile 中的所有时间序列进行元数据检查，默认为 true。开启时，若载入的 tsfile 中的时间序列在当前
iotdb 中也存在，则会比较该时间序列的所有 Measurement 的数据类型是否一致，如果出现不一致将会导致载入失败，关闭该选项会跳过检查，载入更快。
diff --git a/example/mqtt-customize/README.md b/example/mqtt-customize/README.md
index 58f9055871..9fa224c4da 100644
--- a/example/mqtt-customize/README.md
+++ b/example/mqtt-customize/README.md
@@ -35,8 +35,8 @@ The example is to show how to customize your MQTT message
format
Then, in your server:
* Create ${IOTDB_HOME}/ext/mqtt/ folder, and put the jar into this folder.
-* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
iotdb-engine.properties)
-* Set the value of `mqtt_payload_formatter` in `conf/iotdb-engine.properties`
as the value of getName() in your implementation
+* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
iotdb-datanode.properties)
+* Set the value of `mqtt_payload_formatter` in
`conf/iotdb-datanode.properties` as the value of getName() in your
implementation
* Launch the IoTDB server.
* Now IoTDB will use your implementation to parse the MQTT message.
diff --git
a/example/mqtt-customize/src/main/java/org/apache/iotdb/mqtt/server/CustomizedJsonPayloadFormatter.java
b/example/mqtt-customize/src/main/java/org/apache/iotdb/mqtt/server/CustomizedJsonPayloadFormatter.java
index 27fd9ce224..3332dba096 100644
---
a/example/mqtt-customize/src/main/java/org/apache/iotdb/mqtt/server/CustomizedJsonPayloadFormatter.java
+++
b/example/mqtt-customize/src/main/java/org/apache/iotdb/mqtt/server/CustomizedJsonPayloadFormatter.java
@@ -56,7 +56,7 @@ public class CustomizedJsonPayloadFormatter implements
PayloadFormatter {
@Override
public String getName() {
- // set the value of mqtt_payload_formatter in iotdb-engine.properties as
the following string:
+ // set the value of mqtt_payload_formatter in iotdb-datanode.properties as
the following string:
return "CustomizedJson";
}
}
diff --git a/example/mqtt/README.md b/example/mqtt/README.md
index 9f8c8a5ab5..9aa6288a7b 100644
--- a/example/mqtt/README.md
+++ b/example/mqtt/README.md
@@ -27,7 +27,7 @@ The example is to show how to send data to IoTDB from a mqtt
client.
## Usage
-* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
iotdb-engine.properties)
+* Update configuration to enable MQTT service. (`enable_mqtt_service=true` in
iotdb-datanode.properties)
* Launch the IoTDB server.
* Setup storage group `SET STORAGE GROUP TO root.sg` and create time
timeseries `CREATE TIMESERIES root.sg.d1.s1 WITH DATATYPE=DOUBLE,
ENCODING=PLAIN`.
* Run `org.apache.iotdb.mqtt.MQTTClient` to run the mqtt client and send
events to server.
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
index 1a1ca12076..d9451b4c55 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
@@ -60,7 +60,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
@Override
protected String getConfigPath() {
- return workDirFilePath("datanode" + File.separator + "conf",
"iotdb-engine.properties");
+ return workDirFilePath("datanode" + File.separator + "conf",
"iotdb-datanode.properties");
}
@Override
diff --git
a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java
b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java
index 149a63f8ca..f3764894cb 100644
---
a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java
+++
b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java
@@ -115,7 +115,7 @@ public class ClusterNode {
clusterConfig.putAll(clusterProperties);
clusterConfig.store(new FileWriter(clusterConfigPath), null);
- // iotdb-engine.properties part
+ // iotdb-datanode.properties part
String engineConfigPath =
this.path
+ File.separator
@@ -123,7 +123,7 @@ public class ClusterNode {
+ File.separator
+ "conf"
+ File.separator
- + "iotdb-engine.properties";
+ + "iotdb-datanode.properties";
Properties engineConfig = new Properties();
engineConfig.load(new FileInputStream(engineConfigPath));
diff --git a/schema-engine-rocksdb/README.md b/schema-engine-rocksdb/README.md
index 6480b6a99f..cd01c73a6c 100644
--- a/schema-engine-rocksdb/README.md
+++ b/schema-engine-rocksdb/README.md
@@ -33,6 +33,6 @@ After that, you can get a **conf** directory and a **lib**
directory in
schema-engine-rocksdb/target/schema-engine-rocksdb. Copy the file in the conf
directory to the conf directory of server,
and copy the files in the lib directory to the lib directory of server.
-Then, open the **iotdb-engine.properties** in the conf directory of server,
and set the `schema_engine_mode` to
+Then, open the **iotdb-datanode.properties** in the conf directory of server,
and set the `schema_engine_mode` to
Rocksdb_based, set the `enable_last_cache` to false. Restart the IoTDB, the
system will use `RSchemaRegion` to manage
the metadata.
\ No newline at end of file
diff --git
a/schema-engine-rocksdb/src/assembly/resources/conf/schema-rocksdb.properties
b/schema-engine-rocksdb/src/assembly/resources/conf/schema-rocksdb.properties
index fafacf4afb..6703cd48f0 100644
---
a/schema-engine-rocksdb/src/assembly/resources/conf/schema-rocksdb.properties
+++
b/schema-engine-rocksdb/src/assembly/resources/conf/schema-rocksdb.properties
@@ -22,20 +22,20 @@
####################
# This configuration takes effect only when the schema engine mode is
Rocksdb_based.
-# The mode is configured in the
'iotdb-engine.properties'(schema_engine_mode=Rocksdb_based).
+# The mode is configured in the
'iotdb-datanode.properties'(schema_engine_mode=Rocksdb_based).
####################
### Cache Configuration
####################
# A proper cache size can speed up metadata query.You can configure the cache
size as required.
-# By default, the block cache is calculated based on parameter
'write_read_schema_free_memory_proportion' in 'iotdb-engine.properties'.
+# By default, the block cache is calculated based on parameter
'write_read_schema_free_memory_proportion' in 'iotdb-datanode.properties'.
# Assuming 30GB of memory allocated to the schema, that will allocate 30GB to
the following configuration items in proportion.
# Datatype: long
# LRU block cache size. Block cache is where RocksDB caches data in memory for
reads.
# The block cache stores uncompressed blocks.
# The default value is 2/3 of the schema memory configured for parameter
-# 'write_read_schema_free_memory_proportion' in the 'iotdb-engine.properties'.
+# 'write_read_schema_free_memory_proportion' in the
'iotdb-datanode.properties'.
# For example, if the total configured memory size is 30GB and the schema
ratio is 1/10,
# the default value is 30GB * 1/10 * 2/3
# block_cache_size=2147483648
@@ -44,7 +44,7 @@
# LRU block cache size. Block cache is where RocksDB caches data in memory for
reads.
# The block cache stores compressed blocks.
# The default value is 1/3 of the schema memory configured for parameter
-# 'write_read_schema_free_memory_proportion' in the 'iotdb-engine.properties'.
+# 'write_read_schema_free_memory_proportion' in the
'iotdb-datanode.properties'.
# For example, if the total configured memory size is 30GB and the schema
ratio is 1/10,
# the default value is 30GB * 1/10 * 1/3
# block_cache_compressed_size=1073741824
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-datanode.properties
similarity index 100%
rename from server/src/assembly/resources/conf/iotdb-engine.properties
rename to server/src/assembly/resources/conf/iotdb-datanode.properties
diff --git a/server/src/assembly/resources/sbin/stop-datanode.bat
b/server/src/assembly/resources/sbin/stop-datanode.bat
index b7de06477f..fe9417158b 100644
--- a/server/src/assembly/resources/sbin/stop-datanode.bat
+++ b/server/src/assembly/resources/sbin/stop-datanode.bat
@@ -23,12 +23,12 @@ set current_dir=%~dp0
set superior_dir=%current_dir%\..\
for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^rpc_port"
-%superior_dir%\conf\iotdb-engine.properties') do (
+%superior_dir%\conf\iotdb-datanode.properties') do (
set rpc_port=%%i
)
for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_address"
-%superior_dir%\conf\iotdb-engine.properties') do (
+%superior_dir%\conf\iotdb-datanode.properties') do (
set rpc_address=%%i
)
diff --git a/server/src/assembly/resources/sbin/stop-server.bat
b/server/src/assembly/resources/sbin/stop-server.bat
index a2f85581fa..1aa1933dfa 100755
--- a/server/src/assembly/resources/sbin/stop-server.bat
+++ b/server/src/assembly/resources/sbin/stop-server.bat
@@ -23,12 +23,12 @@ set current_dir=%~dp0
set superior_dir=%current_dir%\..\
for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^rpc_port"
-%superior_dir%\conf\iotdb-engine.properties') do (
+%superior_dir%\conf\iotdb-datanode.properties') do (
set rpc_port=%%i
)
for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "rpc_address"
-%superior_dir%\conf\iotdb-engine.properties') do (
+%superior_dir%\conf\iotdb-datanode.properties') do (
set rpc_address=%%i
)
diff --git a/server/src/assembly/resources/sbin/stop-server.sh
b/server/src/assembly/resources/sbin/stop-server.sh
index 553f619eea..712c91a6d3 100755
--- a/server/src/assembly/resources/sbin/stop-server.sh
+++ b/server/src/assembly/resources/sbin/stop-server.sh
@@ -19,7 +19,7 @@
#
IOTDB_CONF="`dirname "$0"`/../conf"
-rpc_port=`sed '/^rpc_port=/!d;s/.*=//' ${IOTDB_CONF}/iotdb-engine.properties`
+rpc_port=`sed '/^rpc_port=/!d;s/.*=//' ${IOTDB_CONF}/iotdb-datanode.properties`
PID=""
function getPid {
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 0f32800616..26ba351a27 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
@@ -59,7 +59,7 @@ public class IoTDBConfig {
/* Names of Watermark methods */
public static final String WATERMARK_GROUPED_LSB = "GroupBasedLSBMethod";
- static final String CONFIG_NAME = "iotdb-engine.properties";
+ static final String CONFIG_NAME = "iotdb-datanode.properties";
private static final Logger logger =
LoggerFactory.getLogger(IoTDBConfig.class);
private static final String MULTI_DIR_STRATEGY_PREFIX =
"org.apache.iotdb.db.conf.directories.strategy.";
@@ -780,13 +780,13 @@ public class IoTDBConfig {
/**
* whether enable the rpc service. This parameter has no a corresponding
field in the
- * iotdb-engine.properties
+ * iotdb-datanode.properties
*/
private boolean enableRpcService = true;
/**
* whether enable the influxdb rpc service. This parameter has no a
corresponding field in the
- * iotdb-engine.properties
+ * iotdb-datanode.properties
*/
private boolean enableInfluxDBRpcService = false;
diff --git
a/server/src/main/java/org/apache/iotdb/db/exception/query/PathNumOverLimitException.java
b/server/src/main/java/org/apache/iotdb/db/exception/query/PathNumOverLimitException.java
index c9efadf400..488f2d535d 100644
---
a/server/src/main/java/org/apache/iotdb/db/exception/query/PathNumOverLimitException.java
+++
b/server/src/main/java/org/apache/iotdb/db/exception/query/PathNumOverLimitException.java
@@ -26,7 +26,7 @@ public class PathNumOverLimitException extends
QueryProcessException {
public PathNumOverLimitException() {
super(
String.format(
- "Too many paths in one query! Currently allowed max deduplicated
path number is %d. Please use slimit or adjust max_deduplicated_path_num in
iotdb-engine.properties.",
+ "Too many paths in one query! Currently allowed max deduplicated
path number is %d. Please use slimit or adjust max_deduplicated_path_num in
iotdb-datanode.properties.",
IoTDBDescriptor.getInstance().getConfig().getMaxQueryDeduplicatedPathNum()));
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
index a0861a2454..b3cf924efd 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
@@ -45,7 +45,7 @@ public class TagLogFile implements AutoCloseable {
private FileChannel fileChannel;
private static final String LENGTH_EXCEED_MSG =
"Tag/Attribute exceeds the max length limit. "
- + "Please enlarge tag_attribute_total_size in
iotdb-engine.properties";
+ + "Please enlarge tag_attribute_total_size in
iotdb-datanode.properties";
private static final int MAX_LENGTH =
IoTDBDescriptor.getInstance().getConfig().getTagAttributeTotalSize();
diff --git a/server/src/test/resources/datanode1conf/iotdb-engine.properties
b/server/src/test/resources/datanode1conf/iotdb-datanode.properties
similarity index 100%
rename from server/src/test/resources/datanode1conf/iotdb-engine.properties
rename to server/src/test/resources/datanode1conf/iotdb-datanode.properties
diff --git a/server/src/test/resources/datanode2conf/iotdb-engine.properties
b/server/src/test/resources/datanode2conf/iotdb-datanode.properties
similarity index 100%
rename from server/src/test/resources/datanode2conf/iotdb-engine.properties
rename to server/src/test/resources/datanode2conf/iotdb-datanode.properties
diff --git a/server/src/test/resources/datanode3conf/iotdb-engine.properties
b/server/src/test/resources/datanode3conf/iotdb-datanode.properties
similarity index 100%
rename from server/src/test/resources/datanode3conf/iotdb-engine.properties
rename to server/src/test/resources/datanode3conf/iotdb-datanode.properties
diff --git a/server/src/test/resources/iotdb-engine.properties
b/server/src/test/resources/iotdb-datanode.properties
similarity index 100%
rename from server/src/test/resources/iotdb-engine.properties
rename to server/src/test/resources/iotdb-datanode.properties
diff --git
a/testcontainer/src/test/java/org/apache/iotdb/db/sql/SingleNodeIT.java
b/testcontainer/src/test/java/org/apache/iotdb/db/sql/SingleNodeIT.java
index a7a977f346..fa75d1e63c 100644
--- a/testcontainer/src/test/java/org/apache/iotdb/db/sql/SingleNodeIT.java
+++ b/testcontainer/src/test/java/org/apache/iotdb/db/sql/SingleNodeIT.java
@@ -49,8 +49,8 @@ public class SingleNodeIT extends Cases {
.withImagePullPolicy(PullPolicy.defaultPolicy())
// mount another properties for changing parameters, e.g., open 5555
port (sync module)
.withFileSystemBind(
- new
File("src/test/resources/iotdb-engine.properties").getAbsolutePath(),
- "/iotdb/conf/iotdb-engine.properties",
+ new
File("src/test/resources/iotdb-datanode.properties").getAbsolutePath(),
+ "/iotdb/conf/iotdb-datanode.properties",
BindMode.READ_ONLY)
.withFileSystemBind(
new
File("src/test/resources/logback-container.xml").getAbsolutePath(),
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 bc39353947..5d36d6286b 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
@@ -55,7 +55,7 @@ public class TSFileConfig implements Serializable {
public static final String STRING_ENCODING = "UTF-8";
public static final Charset STRING_CHARSET =
Charset.forName(STRING_ENCODING);
- public static final String CONFIG_FILE_NAME = "iotdb-engine.properties";
+ public static final String CONFIG_FILE_NAME = "iotdb-datanode.properties";
public static final String MAGIC_STRING = "TsFile";
public static final String VERSION_NUMBER_V2 = "000002";
public static final String VERSION_NUMBER_V1 = "000001";
![https://user-images.githubusercontent.com/6711230/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png"](https://user-images.githubusercontent.com/6711230/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png"){kind=link}