From 2a402607c2f5df12b074c024741b3e75d6e65971 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Mon, 5 Dec 2022 14:44:57 +0800 Subject: [PATCH 1/5] docbug --- docs/UserGuide/Data-Concept/Data-Type.md | 2 +- docs/zh/UserGuide/Data-Concept/Data-Type.md | 2 +- docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/UserGuide/Data-Concept/Data-Type.md b/docs/UserGuide/Data-Concept/Data-Type.md index 2ecdb09b6443..d36a10012ddb 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/DataNode-Config-Manual.md) in the configuration file `iotdb-datanode.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/DataNode-Config-Manual.md) in the configuration file `iotdb-common.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/zh/UserGuide/Data-Concept/Data-Type.md b/docs/zh/UserGuide/Data-Concept/Data-Type.md index c17ea00f5e6f..0c2aae7f3fa4 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-datanode.properties`文件中的 [float_precision 项](../Reference/DataNode-Config-Manual.md) 配置。 +其中 **FLOAT** 与 **DOUBLE** 类型的序列，如果编码方式采用 [RLE](Encoding.md) 或 [TS_2DIFF](Encoding.md) 可以指定 MAX_POINT_NUMBER，该项为浮点数的小数点后位数，若不指定则系统会根据配置文件`iotdb-common.properties`文件中的 [float_precision 项](../Reference/DataNode-Config-Manual.md) 配置。 当系统中用户输入的数据类型与该时间序列的数据类型不对应时，系统会提醒类型错误，如下所示，二阶差分编码不支持布尔类型： diff --git a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md index 9a1d0f96c37e..e732d766fac4 100644 --- a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md @@ -80,7 +80,7 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。 |:------:|:----------------------| | 描述 | ConfigNode 集群服务监听端口 | | 类型 | Short Int : [0,65535] | -| 默认值 | 6667 | +| 默认值 | 22277 | | 改后生效方式 | 重启服务生效 | ### 共识协议 From 7f4385539685466173ed7a061aec031b51451b48 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Wed, 11 Jan 2023 17:46:07 +0800 Subject: [PATCH 2/5] name-bug --- docs/UserGuide/API/Programming-MQTT.md | 2 +- docs/zh/UserGuide/API/Programming-MQTT.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide/API/Programming-MQTT.md b/docs/UserGuide/API/Programming-MQTT.md index 9e882edeb74f..d31460ab4ee3 100644 --- a/docs/UserGuide/API/Programming-MQTT.md +++ b/docs/UserGuide/API/Programming-MQTT.md @@ -162,7 +162,7 @@ public class CustomizedJsonPayloadFormatter implements PayloadFormatter { } } ``` -* modify the file in `src/main/resources/META-INF/services/org.apache.iotdb.db.mqtt.PayloadFormatter`: +* modify the file in `src/main/resources/META-INF/services/org.apache.iotdb.db.protocol.mqtt.PayloadFormatter`: clean the file and put your implementation class name into the file. In this example, the content is: `org.apache.iotdb.mqtt.server.CustomizedJsonPayloadFormatter` * compile your implementation as a jar file: `mvn package -DskipTests` diff --git a/docs/zh/UserGuide/API/Programming-MQTT.md b/docs/zh/UserGuide/API/Programming-MQTT.md index 7ea0504fa3e7..bb73de176551 100644 --- a/docs/zh/UserGuide/API/Programming-MQTT.md +++ b/docs/zh/UserGuide/API/Programming-MQTT.md @@ -161,7 +161,7 @@ public class CustomizedJsonPayloadFormatter implements PayloadFormatter { } } ``` -* 修改项目中的 `src/main/resources/META-INF/services/org.apache.iotdb.db.mqtt.PayloadFormatter` 文件: +* 修改项目中的 `src/main/resources/META-INF/services/org.apache.iotdb.db.protocol.mqtt.PayloadFormatter` 文件: 将示例中的文件内容清除，并将刚才的实现类的全名（包名.类名）写入文件中。注意，这个文件中只有一行。 在本例中，文件内容为: `org.apache.iotdb.mqtt.server.CustomizedJsonPayloadFormatter` * 编译项目生成一个 jar 包: `mvn package -DskipTests` From 5746b2a541970f0b524deb8066e4e7a578e99c7d Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Thu, 2 Feb 2023 15:37:42 +0800 Subject: [PATCH 3/5] doc-delete --- .../API/Programming-Java-Native-API.md | 44 ------------------- .../API/Programming-Java-Native-API.md | 36 --------------- 2 files changed, 80 deletions(-) diff --git a/docs/UserGuide/API/Programming-Java-Native-API.md b/docs/UserGuide/API/Programming-Java-Native-API.md index bb0289551c00..3ef6f5254657 100644 --- a/docs/UserGuide/API/Programming-Java-Native-API.md +++ b/docs/UserGuide/API/Programming-Java-Native-API.md @@ -221,50 +221,6 @@ template.addToTemplate(nodeSpeed); createSchemaTemplate(flatTemplate); ``` -After measurement template created, you can edit the template with belowed APIs. - -**Attention: ** - -**1. templates had been set could not be pruned** - -**2. templates will be activated until data points insert into correspoding measurements** - -**3. templates will not be shown by showtimeseries before activating** - -```java -// Add aligned measurements to a template -public void addAlignedMeasurementsInTemplate(String templateName, - String[] measurementsPath, - TSDataType[] dataTypes, - TSEncoding[] encodings, - CompressionType[] compressors); - -// Add one aligned measurement to a template -public void addAlignedMeasurementInTemplate(String templateName, - String measurementPath, - TSDataType dataType, - TSEncoding encoding, - CompressionType compressor); - - -// Add unaligned measurements to a template -public void addUnalignedMeasurementInTemplate(String templateName, - String measurementPath, - TSDataType dataType, - TSEncoding encoding, - CompressionType compressor); - -// Add one unaligned measurement to a template -public void addUnalignedMeasurementsIntemplate(String templateName, - String[] measurementPaths, - TSDataType[] dataTypes, - TSEncoding[] encodings, - CompressionType[] compressors); - -// Delete a node in template -public void deleteNodeInTemplate(String templateName, String path); -``` - You can query measurement inside templates with these APIS: ```java diff --git a/docs/zh/UserGuide/API/Programming-Java-Native-API.md b/docs/zh/UserGuide/API/Programming-Java-Native-API.md index 8d7ccc960679..94ac1001f410 100644 --- a/docs/zh/UserGuide/API/Programming-Java-Native-API.md +++ b/docs/zh/UserGuide/API/Programming-Java-Native-API.md @@ -221,42 +221,6 @@ template.addToTemplate(nodeSpeed); createSchemaTemplate(flatTemplate); ``` -* 在创建概念元数据模板以后，还可以通过以下接口增加或删除模板内的物理量。请注意，已经挂载的模板不能删除内部的物理量。 - -```java -// 为指定模板新增一组对齐的物理量，若其父节点在模板中已经存在，且不要求对齐，则报错 -public void addAlignedMeasurementsInTemplate(String templateName, - String[] measurementsPath, - TSDataType[] dataTypes, - TSEncoding[] encodings, - CompressionType[] compressors); - -// 为指定模板新增一个对齐物理量, 若其父节点在模板中已经存在，且不要求对齐，则报错 -public void addAlignedMeasurementInTemplate(String templateName, - String measurementPath, - TSDataType dataType, - TSEncoding encoding, - CompressionType compressor); - - -// 为指定模板新增一个不对齐物理量, 若其父节在模板中已经存在，且要求对齐，则报错 -public void addUnalignedMeasurementInTemplate(String templateName, - String measurementPath, - TSDataType dataType, - TSEncoding encoding, - CompressionType compressor); - -// 为指定模板新增一组不对齐的物理量, 若其父节在模板中已经存在，且要求对齐，则报错 -public void addUnalignedMeasurementsIntemplate(String templateName, - String[] measurementPaths, - TSDataType[] dataTypes, - TSEncoding[] encodings, - CompressionType[] compressors); - -// 从指定模板中删除一个节点 -public void deleteNodeInTemplate(String templateName, String path); -``` - * 对于已经创建的元数据模板，还可以通过以下接口查询模板信息： ```java From 4a7765535ea9a5759d009b243894df7b85e11110 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Mon, 6 Feb 2023 11:27:27 +0800 Subject: [PATCH 4/5] review-solve --- docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md index d74203b62ed4..98fcca5eea86 100644 --- a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md @@ -79,7 +79,7 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。 |:------:|:----------------------| | 描述 | ConfigNode 集群服务监听端口 | | 类型 | Short Int : [0,65535] | -| 默认值 | 22277 | +| 默认值 | 10710 | | 改后生效方式 | 重启服务生效 | ### 共识协议 From 14aa5aead9481734bbcb2138ac7b1075a6d3bf86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jul 2023 02:35:27 +0000 Subject: [PATCH 5/5] Bump scalatest_2.12 from 3.2.14 to 3.2.16 Bumps [scalatest_2.12](https://github.com/scalatest/scalatest) from 3.2.14 to 3.2.16. - [Release notes](https://github.com/scalatest/scalatest/releases) - [Commits](https://github.com/scalatest/scalatest/compare/release-3.2.14...release-3.2.16) --- updated-dependencies: - dependency-name: org.scalatest:scalatest_2.12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c2ba2018275..1b8952d5986b 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ 2.23.4 3.2 2.0.9 - 3.2.14 + 3.2.16 1.6 0.41 200