(iotdb-docs) branch Update-version-v13-->-v0.13 deleted (was a0ee2f6)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch Update-version-v13-->-v0.13 in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git was a0ee2f6 Update version v13 -> v0.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch main updated: Update version v13 -> v0.13 (#237)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new c5f8e3b Update version v13 -> v0.13 (#237) c5f8e3b is described below commit c5f8e3b5b852c2c9f754a175195fb0a91786a9e0 Author: Jialin Qiao AuthorDate: Tue May 28 13:15:27 2024 +0800 Update version v13 -> v0.13 (#237) --- src/Download/README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Download/README.md b/src/Download/README.md index 6928118..0a62ab1 100644 --- a/src/Download/README.md +++ b/src/Download/README.md @@ -76,7 +76,7 @@ Legacy version are available here: [https://archive.apache.org/dist/iotdb/](http ## About Version 1.0 -**After we release version 1.0, how to upgrade from v.13.x to v1.0.x?** +**After we release version 1.0, how to upgrade from v0.13.x to v1.0.x?** - **Version 1.0 has changed the SQL syntax conventions (please refer to the syntax conventions section of the user manual)**. - In order to ensure the stability of UDF-related APIs, in version 1.0, UDF-related APIs are seperated into an independent module and no longer depend on the tsfile package. The implemented UDFs need to rewrite the code, replace `TsDataType` with `Type`, and replace `org .apache.iotdb.tsfile.utils.Binary` with `org.apache.iotdb.udf.api.type.Binary`, then redo the packaging and loading process. @@ -220,7 +220,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: with what you set in the old version. * stop the old version instance, and start the new one. -- How to upgrade from v.12.x to v0.13.x? +- How to upgrade from v0.12.x to v0.13.x? * The data format (i.e., TsFile data) of v0.12.x and v0.13.x are compatible, but the WAL file is incompatible. So, you can follow the steps: @@ -241,7 +241,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: * **['\u2E80'..'\u9FFF'] (UNICODE Chinese characters)** * **In 0.13, if the path node name in the `SELECT` clause consists of pure numbers, it needs to be enclosed in backquotes to distinguish it from the constant in the expression. For example, in the statement "select 123 + \`123\` from root.sg", the former 123 represents a constant, and the latter \`123\` will be spliced with root.sg, indicating the path root.sg.\`123\`.** -- How to upgrade from v.11.x or v0.10.x to v0.12.x? +- How to upgrade from v0.11.x or v0.10.x to v0.12.x? * Upgrading from v0.11 or v0.10 to v0.12 is similar as v0.9 to v0.10. The upgrade tool will rewrite the data files automatically. * **Stop writing new data.** * Call `flush` command using sbin/start-cli.sh in original version to close all TsFiles. @@ -256,7 +256,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: * __NOTICE 2: V0.12 doesn't support upgrade from v0.9 or lower version, please upgrade to v0.10 first if needed.__ * __NOTICE 3: We don't recommend deleting data before the upgrading finished. The deletion will fail if you try to delete data in the database with upgrading files.__ -- How to upgrade from v.10.x to v0.11.x? +- How to upgrade from v0.10.x to v0.11.x? * The data format (i.e., TsFile data) of v0.10.x and v0.11 are compatible, but the WAL file is incompatible. So, you can follow the steps: * **Stop writing new data.**
(iotdb-docs) 01/01: Update version v13 -> v0.13
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch Update-version-v13-->-v0.13 in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git commit a0ee2f69ee9f3141e38dd9a5f111e78935f73aa0 Author: Jialin Qiao AuthorDate: Tue May 28 11:59:15 2024 +0800 Update version v13 -> v0.13 --- src/Download/README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Download/README.md b/src/Download/README.md index 6928118..0a62ab1 100644 --- a/src/Download/README.md +++ b/src/Download/README.md @@ -76,7 +76,7 @@ Legacy version are available here: [https://archive.apache.org/dist/iotdb/](http ## About Version 1.0 -**After we release version 1.0, how to upgrade from v.13.x to v1.0.x?** +**After we release version 1.0, how to upgrade from v0.13.x to v1.0.x?** - **Version 1.0 has changed the SQL syntax conventions (please refer to the syntax conventions section of the user manual)**. - In order to ensure the stability of UDF-related APIs, in version 1.0, UDF-related APIs are seperated into an independent module and no longer depend on the tsfile package. The implemented UDFs need to rewrite the code, replace `TsDataType` with `Type`, and replace `org .apache.iotdb.tsfile.utils.Binary` with `org.apache.iotdb.udf.api.type.Binary`, then redo the packaging and loading process. @@ -220,7 +220,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: with what you set in the old version. * stop the old version instance, and start the new one. -- How to upgrade from v.12.x to v0.13.x? +- How to upgrade from v0.12.x to v0.13.x? * The data format (i.e., TsFile data) of v0.12.x and v0.13.x are compatible, but the WAL file is incompatible. So, you can follow the steps: @@ -241,7 +241,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: * **['\u2E80'..'\u9FFF'] (UNICODE Chinese characters)** * **In 0.13, if the path node name in the `SELECT` clause consists of pure numbers, it needs to be enclosed in backquotes to distinguish it from the constant in the expression. For example, in the statement "select 123 + \`123\` from root.sg", the former 123 represents a constant, and the latter \`123\` will be spliced with root.sg, indicating the path root.sg.\`123\`.** -- How to upgrade from v.11.x or v0.10.x to v0.12.x? +- How to upgrade from v0.11.x or v0.10.x to v0.12.x? * Upgrading from v0.11 or v0.10 to v0.12 is similar as v0.9 to v0.10. The upgrade tool will rewrite the data files automatically. * **Stop writing new data.** * Call `flush` command using sbin/start-cli.sh in original version to close all TsFiles. @@ -256,7 +256,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: * __NOTICE 2: V0.12 doesn't support upgrade from v0.9 or lower version, please upgrade to v0.10 first if needed.__ * __NOTICE 3: We don't recommend deleting data before the upgrading finished. The deletion will fail if you try to delete data in the database with upgrading files.__ -- How to upgrade from v.10.x to v0.11.x? +- How to upgrade from v0.10.x to v0.11.x? * The data format (i.e., TsFile data) of v0.10.x and v0.11 are compatible, but the WAL file is incompatible. So, you can follow the steps: * **Stop writing new data.**
(iotdb-docs) branch Update-version-v13-->-v0.13 created (now a0ee2f6)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch Update-version-v13-->-v0.13 in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git at a0ee2f6 Update version v13 -> v0.13 This branch includes the following new commits: new a0ee2f6 Update version v13 -> v0.13 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(iotdb-docs) branch main updated: 修改中文“可视化控制台”文档，新增英文“Workbench”文档内容及其入口 (#234)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new fb7efd0 修改中文“可视化控制台”文档，新增英文“Workbench”文档内容及其入口 (#234)
fb7efd0 is described below
commit fb7efd045f42cae5a3e95ed198f60bc6a8783c7c
Author: majialin <107627937+mal...@users.noreply.github.com>
AuthorDate: Mon May 27 15:07:55 2024 +0800
修改中文“可视化控制台”文档，新增英文“Workbench”文档内容及其入口 (#234)
---
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 2 +-
.../Master/Tools-System/Workbench_timecho.md | 85 +++---
.../V1.2.x/Tools-System/Workbench_timecho.md | 85 +++---
.../latest/Tools-System/Workbench_timecho.md | 85 +++---
.../Master/Tools-System/Workbench_timecho.md | 82 +++--
.../V1.2.x/Tools-System/Workbench_timecho.md | 82 +++--
.../latest/Tools-System/Workbench_timecho.md | 82 +++--
8 files changed, 167 insertions(+), 338 deletions(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
index d68314e..8f83a30 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
@@ -101,7 +101,7 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'CLI', link: 'CLI' },
-// { text: 'Workbench', link: 'Workbench' },
+{ text: 'Workbench', link: 'Workbench_timecho' },
{ text: 'Monitor Tool', link: 'Monitor-Tool' },
{ text: 'Benchmark', link: 'Benchmark' },
{ text: 'Maintenance Tool', link: 'Maintenance-Tool_timecho' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index 864ef2a..082fcc9 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -103,7 +103,7 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'CLI', link: 'CLI' },
-// { text: 'Workbench', link: 'Workbench' },
+{ text: 'Workbench', link: 'Workbench_timecho' },
{ text: 'Monitor Tool', link: 'Monitor-Tool_timecho' },
{ text: 'Benchmark', link: 'Benchmark' },
{ text: 'Maintenance Tool', link: 'Maintenance-Tool_timecho' },
diff --git a/src/UserGuide/Master/Tools-System/Workbench_timecho.md
b/src/UserGuide/Master/Tools-System/Workbench_timecho.md
index 965669b..c4fe8a1 100644
--- a/src/UserGuide/Master/Tools-System/Workbench_timecho.md
+++ b/src/UserGuide/Master/Tools-System/Workbench_timecho.md
@@ -1,59 +1,30 @@
-# 可视化控制台
-## 第1章 产品介绍
-IoTDB可视化控制台是在Apache
IoTDB企业版时序数据库基础上针对工业场景的实时数据收集、存储与分析一体化的数据管理场景开发的扩展组件，旨在为用户提供高效、可靠的实时数据存储和查询解决方案。它具有体量轻、性能高、易使用的特点，完美对接
Hadoop 与 Spark 生态，适用于工业物联网应用中海量时间序列数据高速写入和复杂分析查询的需求。
-## 第2章 IoTDB兼容性说明
-| Workbench版本号 | 兼容IoTDB版本|
-| --- | |
-| V1.2| V1.2.0V1.2.1V1.2.2V1.3.0 |
+# WorkBench
+## Product Introduction
+IoTDB Visualization Console is an extension component developed for industrial
scenarios based on the IoTDB Enterprise Edition time series database. It
integrates real-time data collection, storage, and analysis, aiming to provide
users with efficient and reliable real-time data storage and query solutions.
It features lightweight, high performance, and ease of use, seamlessly
integrating with the Hadoop and Spark ecosystems. It is suitable for high-speed
writing and complex analytical q [...]
+## Instructions for Use
+| **Functional Module** | **Functional Description**
|
+| -- |
|
+| Instance Management| Support unified management of connected instances,
support creation, editing, and deletion, while visualizing the relationships
between multiple instances, helping customers manage multiple database
instances more clearly |
+| Home | Support viewing the service running status of each
node in the database instance (such as activation status, running status, IP
information, etc.), support viewing the running monitoring status of clusters,
ConfigNodes, and DataNodes, monitor the operational health of the database, and
determine if there are any potential operational issues with the instance. |
+| Measurement Point List | Support directly viewing the measurement point
information in the instance, including database information (such as database
name, data retention time, number of devices, etc.), and measurement point
information (measurement point name, data type, compression encoding, etc.),
while also supporting the creation, export, and deletion of measurement points
either indivi
(iotdb-docs) branch main updated: fix the doc bug of the lastest English version (#229)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new e9261a4 fix the doc bug of the lastest English version (#229)
e9261a4 is described below
commit e9261a4aa2ed908d3b79dfc3fa58847bf4d23941
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Fri May 17 16:00:53 2024 +0800
fix the doc bug of the lastest English version (#229)
---
.../Basic-Concept/Cluster-data-partitioning.md | 2 +-
.../Basic-Concept/Encoding-and-Compression.md | 2 +-
.../Deployment-and-Maintenance/Deployment-Guide.md | 18 +--
.../Deployment-Guide_timecho.md| 36 +++---
.../Monitoring-Board-Install-and-Deploy.md | 6 ++--
.../Master/FAQ/Frequently-asked-questions.md | 16 +-
src/UserGuide/Master/QuickStart/QuickStart.md | 10 +++---
src/UserGuide/Master/Tools-System/Benchmark.md | 2 +-
src/UserGuide/Master/User-Manual/Syntax-Rule.md| 6 ++--
.../Basic-Concept/Cluster-data-partitioning.md | 2 +-
.../Basic-Concept/Encoding-and-Compression.md | 2 +-
.../Deployment-and-Maintenance/Deployment-Guide.md | 18 +--
.../Deployment-Guide_timecho.md| 36 +++---
.../Monitoring-Board-Install-and-Deploy.md | 6 ++--
.../latest/FAQ/Frequently-asked-questions.md | 16 +-
src/UserGuide/latest/QuickStart/QuickStart.md | 10 +++---
src/UserGuide/latest/Tools-System/Benchmark.md | 2 +-
src/UserGuide/latest/User-Manual/Syntax-Rule.md| 6 ++--
.../Basic-Concept/Encoding-and-Compression.md | 2 +-
.../Master/FAQ/Frequently-asked-questions.md | 14 -
src/zh/UserGuide/Master/QuickStart/QuickStart.md | 10 +++---
src/zh/UserGuide/Master/Tools-System/Benchmark.md | 2 +-
src/zh/UserGuide/Master/User-Manual/Syntax-Rule.md | 6 ++--
.../Basic-Concept/Encoding-and-Compression.md | 2 +-
.../latest/FAQ/Frequently-asked-questions.md | 22 ++---
src/zh/UserGuide/latest/QuickStart/QuickStart.md | 10 +++---
src/zh/UserGuide/latest/Tools-System/Benchmark.md | 2 +-
src/zh/UserGuide/latest/User-Manual/Syntax-Rule.md | 6 ++--
28 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/src/UserGuide/Master/Basic-Concept/Cluster-data-partitioning.md
b/src/UserGuide/Master/Basic-Concept/Cluster-data-partitioning.md
index 838f379..030f86e 100644
--- a/src/UserGuide/Master/Basic-Concept/Cluster-data-partitioning.md
+++ b/src/UserGuide/Master/Basic-Concept/Cluster-data-partitioning.md
@@ -23,7 +23,7 @@
IoTDB manages metadata and data based on data partitions (DataRegion),
dividing the data from both the sequence and time dimensions.
-https://alioss.timecho.com/docs/img/%E5%88%86%E5%8C%BA%E6%A7%BD%E4%B8%8E%E6%95%B0%E6%8D%AE%E5%88%86%E5%8C%BA.png?raw=true;>
+https://alioss.timecho.com/upload/data-region.jpg;>
## Partition Slots
diff --git a/src/UserGuide/Master/Basic-Concept/Encoding-and-Compression.md
b/src/UserGuide/Master/Basic-Concept/Encoding-and-Compression.md
index 36a5b6e..57d55a8 100644
--- a/src/UserGuide/Master/Basic-Concept/Encoding-and-Compression.md
+++ b/src/UserGuide/Master/Basic-Concept/Encoding-and-Compression.md
@@ -120,7 +120,7 @@ The specified syntax for compression is detailed in [Create
Timeseries Statement
### Compression Ratio Statistics
-Compression ratio statistics file:
data/system/compression_ratio/Ratio-{ratio_sum}-{memtable_flush_time}
+Compression ratio statistics file: data/datanode/system/compression_ratio
* ratio_sum: sum of memtable compression ratios
* memtable_flush_time: memtable flush times
diff --git
a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md
b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md
index 5560179..89c95a4 100644
--- a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md
+++ b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md
@@ -269,7 +269,7 @@ You can either download the binary release files (see Chap
3.1) or compile with
1. Open our website [Download Page](https://iotdb.apache.org/Download/).
2. Download the binary distribution.
-3. Decompress to get the apache-iotdb-1.0.0-all-bin directory.
+3. Decompress to get the apache-iotdb-1.3.x-all-bin directory.
Compile with source code
@@ -279,14 +279,14 @@ You can either download the binary release files (see
Chap 3.1) or compile with
```
git clone https://github.com/apache/iotdb.git
-git checkout v1.0.0
+git checkout v1.3.x
```
**Website**
1. Open our website [Download Page](https://iotdb.apache.org/Download/).
2. Download the source code.
-3. Decompress to get the apache-iotdb-1.0.0 directory.
+3. Decompress to get the apache-iotdb-1.3.x directory.
# Compile
(iotdb-docs) branch main updated: add the miss part (#228)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 33ba3d1 add the miss part (#228) 33ba3d1 is described below commit 33ba3d140b06c86e479fa48b20eec1c76c7bd2fd Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Sat May 11 17:56:43 2024 +0800 add the miss part (#228) --- src/zh/UserGuide/Master/User-Manual/Authority-Management.md | 1 + src/zh/UserGuide/latest/User-Manual/Authority-Management.md | 1 + 2 files changed, 2 insertions(+) diff --git a/src/zh/UserGuide/Master/User-Manual/Authority-Management.md b/src/zh/UserGuide/Master/User-Manual/Authority-Management.md index ec4cfb9..814762e 100644 --- a/src/zh/UserGuide/Master/User-Manual/Authority-Management.md +++ b/src/zh/UserGuide/Master/User-Manual/Authority-Management.md @@ -95,6 +95,7 @@ IoTDB 主要有两类权限：序列权限、全局权限。 | USE_TRIGGER | - 允许用户创建、删除、查看触发器。与触发器的数据源权限检查相独立。 | | USE_UDF | - 允许用户创建、删除、查看用户自定义函数。与自定义函数的数据源权限检查相独立。 | | USE_CQ | - 允许用户创建、开始、停止、删除、查看管道。允许用户创建、删除、查看管道插件。与管道的数据源权限检查相独立。 | +| USE_PIPE| - 允许用户注册、开始、停止、卸载、查询流处理任务。- 允许用户注册、卸载、查询注册流处理任务插件。 | | EXTEND_TEMPLATE | - 允许自动扩展模板。 | |MAINTAIN | - 允许用户查询、取消查询。 允许用户查看变量。 允许用户查看集群状态。 | |USE_MODEL| - 允许用户创建、删除、查询深度学习模型 | diff --git a/src/zh/UserGuide/latest/User-Manual/Authority-Management.md b/src/zh/UserGuide/latest/User-Manual/Authority-Management.md index ec4cfb9..814762e 100644 --- a/src/zh/UserGuide/latest/User-Manual/Authority-Management.md +++ b/src/zh/UserGuide/latest/User-Manual/Authority-Management.md @@ -95,6 +95,7 @@ IoTDB 主要有两类权限：序列权限、全局权限。 | USE_TRIGGER | - 允许用户创建、删除、查看触发器。与触发器的数据源权限检查相独立。 | | USE_UDF | - 允许用户创建、删除、查看用户自定义函数。与自定义函数的数据源权限检查相独立。 | | USE_CQ | - 允许用户创建、开始、停止、删除、查看管道。允许用户创建、删除、查看管道插件。与管道的数据源权限检查相独立。 | +| USE_PIPE| - 允许用户注册、开始、停止、卸载、查询流处理任务。- 允许用户注册、卸载、查询注册流处理任务插件。 | | EXTEND_TEMPLATE | - 允许自动扩展模板。 | |MAINTAIN | - 允许用户查询、取消查询。 允许用户查看变量。 允许用户查看集群状态。 | |USE_MODEL| - 允许用户创建、删除、查询深度学习模型 |
(iotdb-docs) branch main updated: fix monitoring doc and IoTDB introduction doc (#215)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 4bd079c fix monitoring doc and IoTDB introduction doc (#215)
4bd079c is described below
commit 4bd079c8c07b2121f4cf83657b32b254cf305691
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Thu May 9 18:21:49 2024 +0800
fix monitoring doc and IoTDB introduction doc (#215)
---
src/.vuepress/sidebar/V0.13.x/en.ts| 2 +-
src/.vuepress/sidebar/V0.13.x/zh.ts| 2 +-
src/.vuepress/sidebar/V1.0.x/en.ts | 2 +-
src/.vuepress/sidebar/V1.0.x/zh.ts | 2 +-
src/.vuepress/sidebar/V1.1.x/en.ts | 2 +-
src/.vuepress/sidebar/V1.1.x/zh.ts | 2 +-
src/.vuepress/sidebar/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar/V1.2.x/zh.ts | 2 +-
src/.vuepress/sidebar/V1.3.x/en.ts | 2 +-
src/.vuepress/sidebar/V1.3.x/zh.ts | 2 +-
src/.vuepress/sidebar_timecho/V0.13.x/en.ts| 2 +-
src/.vuepress/sidebar_timecho/V1.0.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.1.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 4 ++--
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 4 ++--
src/UserGuide/Master/IoTDB-Introduction/Publication.md | 10 ++
src/UserGuide/Master/Tools-System/Monitor-Tool.md | 4 ++--
.../Tools-System/{Monitor-Tool.md => Monitor-Tool_timecho.md} | 0
src/UserGuide/V0.13.x/IoTDB-Introduction/Publication.md| 8 +---
src/UserGuide/V0.13.x/Maintenance-Tools/Metric-Tool.md | 4 ++--
src/UserGuide/V1.0.x/IoTDB-Introduction/Publication.md | 7 +--
src/UserGuide/V1.1.x/IoTDB-Introduction/Publication.md | 6 +-
src/UserGuide/V1.1.x/Monitor-Alert/Metric-Tool.md | 4 +---
src/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md | 2 +-
src/UserGuide/V1.2.x/Tools-System/Monitor-Tool.md | 4 +---
.../Tools-System/{Monitor-Tool.md => Monitor-Tool_timecho.md} | 0
src/UserGuide/latest/IoTDB-Introduction/Publication.md | 9 +
src/UserGuide/latest/Tools-System/Monitor-Tool.md | 4 ++--
.../Tools-System/Monitor-Tool_timecho.md} | 0
src/zh/UserGuide/Master/IoTDB-Introduction/Publication.md | 8 +---
src/zh/UserGuide/Master/Tools-System/Monitor-Tool.md | 4 ++--
.../Tools-System/{Monitor-Tool.md => Monitor-Tool_timecho.md} | 0
src/zh/UserGuide/V0.13.x/IoTDB-Introduction/Publication.md | 7 +--
src/zh/UserGuide/V0.13.x/Maintenance-Tools/Metric-Tool.md | 4 ++--
src/zh/UserGuide/V1.0.x/IoTDB-Introduction/Publication.md | 7 +--
src/zh/UserGuide/V1.1.x/IoTDB-Introduction/Publication.md | 7 +--
src/zh/UserGuide/V1.1.x/Monitor-Alert/Metric-Tool.md | 3 +--
src/zh/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md | 2 +-
src/zh/UserGuide/V1.2.x/Tools-System/Monitor-Tool.md | 3 +--
.../Tools-System/{Monitor-Tool.md => Monitor-Tool_timecho.md} | 0
src/zh/UserGuide/latest/IoTDB-Introduction/Publication.md | 10 +-
src/zh/UserGuide/latest/Tools-System/Monitor-Tool.md | 4 ++--
.../Tools-System/Monitor-Tool_timecho.md} | 0
45 files changed, 48 insertions(+), 111 deletions(-)
diff --git a/src/.vuepress/sidebar/V0.13.x/en.ts
b/src/.vuepress/sidebar/V0.13.x/en.ts
index 37562ee..84d2848 100644
--- a/src/.vuepress/sidebar/V0.13.x/en.ts
+++ b/src/.vuepress/sidebar/V0.13.x/en.ts
@@ -33,7 +33,7 @@ export const enSidebar = {
{ text: 'Architecture', link: 'Architecture' },
{ text: 'Scenario', link: 'Scenario' },
{ text: 'Features', link: 'Features' },
-{ text: 'Publication', link: 'Publication' },
+{ text: 'Achievement', link: 'Publication' },
],
},
{
diff --git a/src/.vuepress/sidebar/V0.13.x/zh.ts
b/src/.vuepress/sidebar/V0.13.x/zh.ts
index 9d3bf12..72ff9bd 100644
--- a/src/.vuepress/sidebar/V0.13.x/zh.ts
+++ b/src/.vuepress/sidebar/V0.13.x/zh.ts
@@ -33,7 +33,7 @@ export const zhSidebar = {
{ text: '主要功能特点', link: 'Features' },
{ text: '系统架构', link: 'Architecture' },
{ text: '应用场景', link: 'Scenario' },
-{ text: '研究论文', link: 'Publication' },
+{ text: '学术成果', link: 'Publication' },
],
},
{
diff --g
(iotdb-docs) branch main updated: fix the rest doc bugs of V1.3.1 and master (#217)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new c668871 fix the rest doc bugs of V1.3.1 and master (#217) c668871 is described below commit c6688712895a5d9c1366e22a01e2a7ac752eb89a Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu May 9 15:44:12 2024 +0800 fix the rest doc bugs of V1.3.1 and master (#217) --- .../Deployment-Guide_timecho.md | 1 - src/UserGuide/Master/FAQ/Frequently-asked-questions.md | 9 ++--- src/UserGuide/Master/QuickStart/ClusterQuickStart.md| 4 ++-- src/UserGuide/Master/QuickStart/QuickStart.md | 12 +--- src/UserGuide/Master/SQL-Manual/SQL-Manual.md | 14 +++--- src/UserGuide/Master/User-Manual/AINode_timecho.md | 6 +++--- src/UserGuide/Master/User-Manual/IoTDB-View_timecho.md | 2 +- src/UserGuide/Master/User-Manual/Operate-Metadata.md| 5 - .../Master/User-Manual/Operator-and-Expression.md | 5 +++-- .../Deployment-Guide_timecho.md | 1 - src/UserGuide/latest/FAQ/Frequently-asked-questions.md | 13 - src/UserGuide/latest/QuickStart/ClusterQuickStart.md| 4 ++-- src/UserGuide/latest/QuickStart/QuickStart.md | 12 +--- src/UserGuide/latest/SQL-Manual/SQL-Manual.md | 17 +++-- src/UserGuide/latest/User-Manual/AINode_timecho.md | 6 +++--- src/UserGuide/latest/User-Manual/IoTDB-View_timecho.md | 2 +- src/UserGuide/latest/User-Manual/Operate-Metadata.md| 5 - .../latest/User-Manual/Operator-and-Expression.md | 5 +++-- .../UserGuide/Master/FAQ/Frequently-asked-questions.md | 10 +- src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md| 12 +--- src/zh/UserGuide/Master/User-Manual/AINode_timecho.md | 8 src/zh/UserGuide/Master/User-Manual/Operate-Metadata.md | 5 - src/zh/UserGuide/Master/User-Manual/Syntax-Rule.md | 2 +- .../latest/Basic-Concept/Encoding-and-Compression.md| 2 +- .../UserGuide/latest/FAQ/Frequently-asked-questions.md | 10 +- src/zh/UserGuide/latest/SQL-Manual/SQL-Manual.md| 13 ++--- src/zh/UserGuide/latest/User-Manual/AINode_timecho.md | 8 src/zh/UserGuide/latest/User-Manual/Operate-Metadata.md | 5 - src/zh/UserGuide/latest/User-Manual/Syntax-Rule.md | 2 +- 29 files changed, 80 insertions(+), 120 deletions(-) diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 7e64348..cde1133 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -162,7 +162,6 @@ IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:MaxGCPauseMillis=200" | name| Confignode name | YES | | deploy\_dir | IoTDB config node deployment directory | YES | | iotdb-confignode.properties | Corresponding to `iotdb/config/iotdb-confignode.properties`, please refer to the `iotdb-confignode.properties` file description for more details. | NO | -| cn\_internal\_address | Corresponds to iotdb/internal communication address, corresponding to `cn_internal_address` in `iotdb/config/iotdb-confignode.properties` | YES | | cn_internal_address | The cluster configuration address points to the surviving ConfigNode, and it points to confignode_x by default. When `global` and `confignode_servers` are configured at the same time, the value in `confignode_servers` is used first, corresponding to `cn_internal_address` in `iotdb/config/iotdb-confignode.properties` | YES | | cn\_internal\_port | Internal communication port, corresponding to `cn_internal_port` in `iotdb/config/iotdb-confignode.properties` | YES | | cn\_consensus\_port | Corresponds to `cn_consensus_port` in `iotdb/config/iotdb-confignode.properties` | NO
(iotdb-docs) branch main updated: fix: 下载换行样式 (#225)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 2d3680d fix: 下载换行样式 (#225)
2d3680d is described below
commit 2d3680d8079961d2d8026fabcd3d77b89c91c8b7
Author: tongshs <37606220+tong...@users.noreply.github.com>
AuthorDate: Tue Apr 23 14:58:14 2024 +0800
fix: 下载换行样式 (#225)
---
src/.vuepress/styles/index.scss | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/.vuepress/styles/index.scss b/src/.vuepress/styles/index.scss
index b2558ad..b452898 100644
--- a/src/.vuepress/styles/index.scss
+++ b/src/.vuepress/styles/index.scss
@@ -49,6 +49,11 @@
// }
// }
+table {
+ word-wrap: break-word;
+ word-break: keep-all;
+}
+
td a span{
display: none;
}
(iotdb-docs) branch main updated: 中文合并了“社区”和“开发”文档内容，在社区伙伴中新增了商业支持内容 (#222)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 58fe24e 中文合并了“社区”和“开发”文档内容，在社区伙伴中新增了商业支持内容 (#222)
58fe24e is described below
commit 58fe24ea9586affdb3d8968ba54e53eae826d08f
Author: majialin117 <107627937+mal...@users.noreply.github.com>
AuthorDate: Mon Apr 22 16:19:15 2024 +0800
中文合并了“社区”和“开发”文档内容，在社区伙伴中新增了商业支持内容 (#222)
---
src/.vuepress/navbar/zh.ts | 11 +++
.../Community-Project-Committers.md| 23 +++---
.../Development-Guide.md | 2 +-
src/zh/Community/Materials.md | 1 +
src/zh/{Development => Community}/Powered-By.md| 16 ++-
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/.vuepress/navbar/zh.ts b/src/.vuepress/navbar/zh.ts
index a1e8147..d110763 100644
--- a/src/.vuepress/navbar/zh.ts
+++ b/src/.vuepress/navbar/zh.ts
@@ -43,16 +43,11 @@ export const zhNavbar = navbar([
text: '社区',
children: [
{ text: '关于社区', link: '/zh/Community/About' },
+ { text: '贡献指南', link: '/zh/Community/Development-Guide' },
+ { text: '社区伙伴', link: '/zh/Community/Powered-By' },
{ text: '交流与反馈', link: '/zh/Community/Feedback' },
{ text: '活动与报告', link: 'zh/Community/Materials' },
-],
- },
- {
-text: '开发',
-children: [
- { text: '成为开发者', link: '/zh/Development/Community-Project-Committers' },
- { text: '开发指南', link: '/zh/Development/Development-Guide' },
- { text: 'Power by', link: '/zh/Development/Powered-By' },
+ { text: 'Commiters', link: '/zh/Community/Community-Project-Committers'
},
],
},
{
diff --git a/src/zh/Development/Community-Project-Committers.md
b/src/zh/Community/Community-Project-Committers.md
similarity index 89%
rename from src/zh/Development/Community-Project-Committers.md
rename to src/zh/Community/Community-Project-Committers.md
index c497c7c..2a71a63 100644
--- a/src/zh/Development/Community-Project-Committers.md
+++ b/src/zh/Community/Community-Project-Committers.md
@@ -18,11 +18,11 @@
under the License.
-->
-# 成为开发者
+# Commiters
## 开发人员
-### Project PMC |
+### Project PMC
-| id | githubUsername | public name | starting
date |
+| id | githubUsername | public name | starting date
|
| : | :---: | :---: |
:-: |
| wangchen | | Chen Wang | 2020/9/16
|
|cdutz |chrisdutz | Christofer Dutz |
2020/9/16 |
@@ -88,20 +88,3 @@
| yschengzi || Sicheng Yu|
| yuyuankang | yuyuankang | Yuyuan Kang |
| zyk | MarcosZyk | Yukun Zhou|
-
-
-## 如何成为项目成员
-
-我们的社区存在以下四种身份
-
-- PMC
-- Committe
-- Contributor
-- User
-
-详细说明：
-
-- 若想了解四种身份的详细内容，请查看[社区组织架构](../Community/About.md)
-- 若想成为 PMC ，请查看：[社区评选规章](../Community/About.md#pmc)
-- 若想成为 Committe ，请查看：[社区评选规章](../Community/About.md#committe)
-- 若想成为 Contributor ，请查看：[社区评选规章](../Community/About.md#contributor)
\ No newline at end of file
diff --git a/src/zh/Development/Development-Guide.md
b/src/zh/Community/Development-Guide.md
similarity index 99%
rename from src/zh/Development/Development-Guide.md
rename to src/zh/Community/Development-Guide.md
index d9a8976..fc37fff 100644
--- a/src/zh/Development/Development-Guide.md
+++ b/src/zh/Community/Development-Guide.md
@@ -18,7 +18,7 @@
under the License.
-->
-# 开发指南
+# 贡献指南
## 开发约定
### 代码格式化
我们使用 [Spotless
plugin](https://github.com/diffplug/spotless/tree/main/plugin-maven) 和
[google-java-format](https://github.com/google/google-java-format) 格式化 Java
代码。你可以通过以下步骤将 IDE 配置为在保存时自动应用格式以 IDEA 为例）：
diff --git a/src/zh/Community/Materials.md b/src/zh/Community/Materials.md
index caa34a3..a52ba5b 100644
--- a/src/zh/Community/Materials.md
+++ b/src/zh/Community/Materials.md
@@ -1,3 +1,4 @@
+# 活动与报告
## 2024 年活动
* 2024.03.02，上海，2024 IoTDB 核心技术 Meetup 1：现代开源数据技术
*（中文）[Apache
IoTDB：解锁时序数据存储与应用能力](https://www.bilibili.com/video/BV1ai421R7TM/?spm_id_from=333.999.0.0_source=0b26be0f8d72b3273fcd8e98ca277199)，演讲人：赵馨逸
diff --git a/src/zh/Development/Powered-By.md b/src/zh/Community/Powered-By.md
similarity index 65%
rename from src/zh/Development/Powered-By.md
rename to src/zh/Community/Powered-By.md
index bbdaaae..19ce96e 100644
--- a/src/zh/Development/Powered-By.md
+++ b/src/zh/Community/Powered-By.md
@@ -19,7 +19,7 @@
-->
-## Powered-By
+## 社区伙伴
### 使用“IoTDB”的项目和产品名称
@@ -50,3 +50,17 @@
- 北京清智物联使用 IoTDB 收集调相机（发电机）的监控数据。
- 建龙钢铁在测试 IoTDB。
+
+### 商业支持
+- 与Apache项目相同，Apache IoTDB任何人都可以免费使用。Apache
IoTDB也可以在社区中获得免费支持，但可能会因为时差等原因无法保证能
(iotdb-docs) branch max_min_by deleted (was 9ff76c5)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch max_min_by in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git was 9ff76c5 update The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch main updated: Add docs for aggregation function max_by/min_by (#183)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 413e9d1 Add docs for aggregation function max_by/min_by (#183) 413e9d1 is described below commit 413e9d14f6eb46e1a6a0d80a86b277523963e384 Author: Liao Lanyu <1435078...@qq.com> AuthorDate: Wed Apr 17 12:08:05 2024 +0800 Add docs for aggregation function max_by/min_by (#183) --- .../Master/User-Manual/Operator-and-Expression.md | 33 +-- .../stage/Operators-Functions/Aggregation.md | 197 +- .../latest/User-Manual/Operator-and-Expression.md | 32 +-- .../stage/Operators-Functions/Aggregation.md | 229 ++-- .../Master/Reference/Function-and-Expression.md| 231 +++-- .../Master/User-Manual/Operator-and-Expression.md | 26 +-- .../latest/Reference/Function-and-Expression.md| 196 + .../latest/User-Manual/Operator-and-Expression.md | 2 + 8 files changed, 870 insertions(+), 76 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/Operator-and-Expression.md b/src/UserGuide/Master/User-Manual/Operator-and-Expression.md index 1fe9d71..1bc2604 100644 --- a/src/UserGuide/Master/User-Manual/Operator-and-Expression.md +++ b/src/UserGuide/Master/User-Manual/Operator-and-Expression.md @@ -99,21 +99,24 @@ The built-in functions can be used in IoTDB without registration, and the functi ### Aggregate Functions -| Function Name | Description | Allowed Input Series Data Types | Required Attributes | Output Series Data Type | -| - | | --- | | --- | -| SUM | Summation. | INT32 INT64 FLOAT DOUBLE| / | DOUBLE | -| COUNT | Counts the number of data points. | All types | / | INT | -| AVG | Average. | INT32 INT64 FLOAT DOUBLE| / | DOUBLE | -| EXTREME | Finds the value with the largest absolute value. Returns a positive value if the maximum absolute value of positive and negative values is equal. | INT32 INT64 FLOAT DOUBLE| / | Consistent with the input data type | -| MAX_VALUE | Find the maximum value. | INT32 INT64 FLOAT DOUBLE| / | Consistent with the input data type | -| MIN_VALUE | Find the minimum value. | INT32 INT64 FLOAT DOUBLE| / | Consistent with the input data type | -| FIRST_VALUE | Find the value with the smallest timestamp. | All data types | / | Consistent with input data type | -| LAST_VALUE| Find the value with the largest timestamp. | All data types | / | Consistent with input data type | -| MAX_TIME | Find the maximum timestamp. | All data Types | / | Timestamp | -| MIN_TIME | Find the minimum timestamp. | All data Types | / | Timestamp | -| COUNT_IF | Find the number of data points that continuously meet a given condition and the number of data points that meet the condition (represented by keep) meet the specified threshold. | BOOLEAN | `[keep >=/>/=/!=/= threshold` if `threshold` is used alone, type of `threshold` is `INT64` `ignoreNull`：Optional, default value is `true`；If the value is `true`, null va [...] -| TIME_DURATION | Find the difference between the timestamp of the largest non-null value and the timestamp of the smallest non-null value in a column | All data Types | /
(iotdb-docs) branch update_publication deleted (was 1304c96)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch update_publication in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git was 1304c96 update other versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch main updated: Update publication (#214)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new ce99f96 Update publication (#214) ce99f96 is described below commit ce99f9666c5632082535f52d1ff964ed8f39b652 Author: Jiang Tian AuthorDate: Tue Apr 9 10:49:42 2024 +0800 Update publication (#214) * update publication * update other versions --- .../Master/IoTDB-Introduction/Publication.md| 20 +--- .../V0.13.x/IoTDB-Introduction/Publication.md | 20 +--- .../V1.0.x/IoTDB-Introduction/Publication.md| 20 +--- .../V1.1.x/IoTDB-Introduction/Publication.md| 20 +--- .../V1.2.x/IoTDB-Introduction/Publication.md| 21 + .../latest/IoTDB-Introduction/Publication.md| 21 ++--- .../Master/IoTDB-Introduction/Publication.md| 20 +--- .../V0.13.x/IoTDB-Introduction/Publication.md | 18 +- .../V1.0.x/IoTDB-Introduction/Publication.md| 18 +- .../V1.1.x/IoTDB-Introduction/Publication.md| 19 +-- .../V1.2.x/IoTDB-Introduction/Publication.md| 19 +-- .../latest/IoTDB-Introduction/Publication.md| 21 +++-- 12 files changed, 159 insertions(+), 78 deletions(-) diff --git a/src/UserGuide/Master/IoTDB-Introduction/Publication.md b/src/UserGuide/Master/IoTDB-Introduction/Publication.md index db23cdb..efa87ca 100644 --- a/src/UserGuide/Master/IoTDB-Introduction/Publication.md +++ b/src/UserGuide/Master/IoTDB-Introduction/Publication.md @@ -26,14 +26,20 @@ Apache IoTDB starts at Tsinghua University, School of Software. IoTDB is a database for managing large amount of time series data with columnar storage, data encoding, pre-computation, and index techniques. It has SQL-like interface to write millions of data points per second per node and is optimized to get query results in few seconds over trillions of data points. It can also be easily integrated with Apache Hadoop MapReduce and Apache Spark for analytics. The research papers related are as follows: - -* [Apache IoTDB: time-series database for internet of things](http://www.vldb.org/pvldb/vol13/p2901-wang.pdf), Chen Wang, Xiangdong Huang, Jialin Qiao, - Tian Jiang, Lei Rui, Jinrui Zhang, Rong Kang, Julian Feinauer, Kevin A. McGrail, Peng Wang, Jun Yuan, Jianmin Wang, Jiaguang Sun. VLDB 2020 -* [PISA: An Index for Aggregating Big Time Series Data](https://dl.acm.org/citation.cfm?id=2983775=ACM=DL), Xiangdong Huang and Jianmin Wang and Raymond K. Wong and Jinrui Zhang and Chen Wang. CIKM 2016. -* [Matching Consecutive Subpatterns over Streaming Time Series](https://link.springer.com/chapter/10.1007/978-3-319-96893-3_8), Rong Kang and Chen Wang and Peng Wang and Yuting Ding and Jianmin Wang. APWeb/WAIM 2018. +* [Grouping Time Series for Efficient Columnar Storage](https://sxsong.github.io/doc/23sigmod-group.pdf), Chenguang Fang, Shaoxu Song, Haoquan Guan, Xiangdong Huang, Chen Wang, Jianmin Wang. SIGMOD 2023. +* [Learning Autoregressive Model in LSM-Tree based Store](https://sxsong.github.io/doc/23kdd.pdf), Yunxiang Su, Wenxuan Ma, Shaoxu Song. SIGMOD 2023. +* [TsQuality: Measuring Time Series Data Quality in Apache IoTDB](https://sxsong.github.io/doc/23vldb-qaulity.pdf), Yuanhui Qiu, Chenguang Fang, Shaoxu Song, Xiangdong Huang, Chen Wang, Jianmin Wang. VLDB 2023. +* [Frequency Domain Data Encoding in Apache IoTDB](https://sxsong.github.io/doc/22vldb-frequency.pdf), Haoyu Wang, Shaoxu Song. VLDB 2023. +* [Non-Blocking Raft for High Throughput IoT Data](https://sxsong.github.io/doc/23icde-raft.pdf), Tian Jiang, Xiangdong Huang, Shaoxu Song, Chen Wang, Jianmin Wang, Ruibo Li, Jincheng Sun. ICDE 2023. +* [Backward-Sort for Time Series in Apache IoTDB](https://sxsong.github.io/doc/23icde-sort.pdf), Xiaojian Zhang, Hongyin Zhang, Shaoxu Song, Xiangdong Huang, Chen Wang, Jianmin Wang. ICDE 2023. +* [Time Series Data Encoding for Efficient Storage: A Comparative Analysis in Apache IoTDB](https://sxsong.github.io/doc/22vldb-encoding.pdf), Jinzhao Xiao, Yuxiang Huang, Changyu Hu, Shaoxu Song, Xiangdong Huang, Jianmin Wang. VLDB 2022. +* [Separation or Not: On Handing Out-of-Order Time-Series Data in Leveled LSM-Tree](https://sxsong.github.io/doc/22icde-separation.pdf), Yuyuan Kang, Xiangdong Huang, Shaoxu Song, Lingzhe Zhang, Jialin Qiao, Chen Wang, Jianmin Wang, Julian Feinauer. ICDE 2022. +* [Dual-PISA: An index for aggregation operations on time series data](https://www.sciencedirect.com/science/article/pii/S0306437918305489), Jialin Qiao, Xiangdong Huang, Jianmin Wang, Raymond K Wong. IS 2020. +* [Apache IoTDB: time-series database for internet of things](http://www.vldb.org/pvldb
(iotdb-docs) branch main updated: fix little bug (#211)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 27f9576 fix little bug (#211)
27f9576 is described below
commit 27f9576a29398311d828d8d24ac773331be08a49
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Mon Apr 8 15:45:55 2024 +0800
fix little bug (#211)
---
src/.vuepress/sidebar/V1.3.x/en.ts| 1 +
src/.vuepress/sidebar_timecho/V1.3.x/en.ts| 1 +
.../Monitoring-Board-Install-and-Deploy.md| 4 ++--
src/UserGuide/Master/User-Manual/Maintennance.md | 11 ++-
.../Monitoring-Board-Install-and-Deploy.md| 4 ++--
src/UserGuide/latest/User-Manual/Maintennance.md | 11 ++-
.../Monitoring-Board-Install-and-Deploy.md| 5 +++--
src/zh/UserGuide/Master/User-Manual/Maintennance.md | 11 ++-
.../Monitoring-Board-Install-and-Deploy.md| 4 ++--
src/zh/UserGuide/latest/User-Manual/Maintennance.md | 11 ++-
10 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/.vuepress/sidebar/V1.3.x/en.ts
b/src/.vuepress/sidebar/V1.3.x/en.ts
index 3b6d283..428c0b2 100644
--- a/src/.vuepress/sidebar/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar/V1.3.x/en.ts
@@ -168,6 +168,7 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'UDF Libraries', link: 'UDF-Libraries' },
+{ text: 'Function and Expression', link: 'Function-and-Expression' },
{ text: 'Common Config Manual', link: 'Common-Config-Manual' },
{ text: 'Status Codes', link: 'Status-Codes' },
{ text: 'Keywords', link: 'Keywords' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index d3927dc..ee7be80 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -173,6 +173,7 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'UDF Libraries', link: 'UDF-Libraries' },
+{ text: 'Function and Expression', link: 'Function-and-Expression' },
{ text: 'Common Config Manual', link: 'Common-Config-Manual' },
{ text: 'ConfigNode Config Manual', link: 'ConfigNode-Config-Manual' },
{ text: 'DataNode Config Manual', link: 'DataNode-Config-Manual' },
diff --git
a/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md
b/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md
index 38612f6..b5e8f86 100644
---
a/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md
+++
b/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md
@@ -29,7 +29,7 @@ From the IoTDB 1.0 version, we introduced the system
monitoring module, you can
1. IoTDB: version 1.0 and above, you may contact your sales for the relevant
installer
2. Prometheus: version 2.30.3 and above, download from the official website:
https://prometheus.io/download/
3. Grafana: version 8.4.2 and above, download from the official website:
https://grafana.com/grafana/download
-4. Grafana Dashboards: Grafana Dashboard is a tool for Enterprise IoTDB, and
you may contact your sales for the relevant installer.
+4. IoTDB Dashboards: IoTDB Dashboard is a tool for Enterprise IoTDB, and you
may contact your sales for the relevant installer.
### 1.1.2 Start ConfigNode
1. Enter the `iotdb-enterprise-1.x.x.x-bin` package
@@ -156,7 +156,7 @@ cd grafana-*
-### 1.3.2 Step2：Import the Grafana Dashboards
+### 1.3.2 Step2：Import the IoTDB Dashboards
1. Enter Grafana，click Browse of Dashboards
diff --git a/src/UserGuide/Master/User-Manual/Maintennance.md
b/src/UserGuide/Master/User-Manual/Maintennance.md
index 79e3149..6e0f837 100644
--- a/src/UserGuide/Master/User-Manual/Maintennance.md
+++ b/src/UserGuide/Master/User-Manual/Maintennance.md
@@ -20,14 +20,15 @@
-->
# Maintennance
-## Overview
+## Explain tool
+### Overview
The significance of query analysis lies in assisting users to understand the
execution mechanism and performance bottlenecks of queries, thereby achieving
query optimization and performance improvement. This concerns not only the
efficiency of query execution but also directly affects the user experience of
applications and the effective use of resources. To conduct effective query
analysis, IoTDB provides query analysis tools: Explain and Explain Analyze.
The Explain tool allows users to preview the execution plan of a query SQL,
including how IoTDB organizes data retrieval and processing.
Explain Analyze goe
(iotdb-docs) branch main updated: update monitor deploy doc (#199)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new ab86bc2 update monitor deploy doc (#199) ab86bc2 is described below commit ab86bc2b839fefab9216459d9184196ba842df0a Author: ZhangHongYin <46039728+sprico...@users.noreply.github.com> AuthorDate: Tue Apr 2 14:44:45 2024 +0800 update monitor deploy doc (#199) --- .../Monitoring-Board-Install-and-Deploy.md | 97 ++- .../Monitoring-Board-Install-and-Deploy.md | 97 ++- .../Monitoring-Board-Install-and-Deploy.md | 103 +++-- .../Monitoring-Board-Install-and-Deploy.md | 103 +++-- 4 files changed, 298 insertions(+), 102 deletions(-) diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md b/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md index 48a9ba2..38612f6 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Monitoring-Board-Install-and-Deploy.md @@ -19,32 +19,74 @@ --> -# Monitoring Board Install and Deploy -From the Apache IoTDB 1.0 version, we introduced the system monitoring module, you can complete the Apache IoTDB important operational indicators for monitoring, this article describes how to open the system monitoring module in the Apache IoTDB distribution, and the use of Prometheus + Grafana way to complete the visualisation of the system monitoring indicators. +# 1 Monitoring Board Install and Deploy +From the IoTDB 1.0 version, we introduced the system monitoring module, you can complete the IoTDB important operational indicators for monitoring, this article describes how to open the system monitoring module in the IoTDB distribution, and the use of Prometheus + Grafana way to complete the visualisation of the system monitoring indicators. -## pre-preparation +## 1.1 pre-preparation -### software requirement +### 1.1.1 software requirement -1. Apache IoTDB: version 1.0 and above, download from the official website: https://iotdb.apache.org/Download/ +1. IoTDB: version 1.0 and above, you may contact your sales for the relevant installer 2. Prometheus: version 2.30.3 and above, download from the official website: https://prometheus.io/download/ 3. Grafana: version 8.4.2 and above, download from the official website: https://grafana.com/grafana/download -4. IoTDB-Grafana installer: Grafana Dashboards is an TimechoDB(Enterprise Edition based on IoTDB) tool, and you may contact your sales for the relevant installer. +4. Grafana Dashboards: Grafana Dashboard is a tool for Enterprise IoTDB, and you may contact your sales for the relevant installer. -### cluster requirement +### 1.1.2 Start ConfigNode +1. Enter the `iotdb-enterprise-1.x.x.x-bin` package +2. Modify the configuration file `conf/iotdb-confignode.properties` and modify the following configuration. Other configurations remain unchanged: -Make sure that the IoTDB cluster is started before doing the following. +```properties +cn_metric_reporter_list=PROMETHEUS +cn_metric_level=IMPORTANT +cn_metric_prometheus_reporter_port=9091 +``` + +3. Run the script to start ConfigNode: `./sbin/start-confignode.sh`. If the following prompt appears, the startup is successful: + + + +4. Enter the http://localhost:9091/metrics URL in the browser, and you can view the following monitoring item information: + + + +5. Similarly, the other two ConfigNode nodes can be configured to ports 9092 and 9093 respectively. + +### 1.1.3 Start DataNode +1. Enter the `iotdb-enterprise-1.x.x.x-bin` package +2. Modify the configuration file `conf/iotdb-datanode.properties` and modify the following configuration. Other configurations remain unchanged: + +```properties +dn_metric_reporter_list=PROMETHEUS +dn_metric_level=IMPORTANT +dn_metric_prometheus_reporter_port=9094 +``` + +3. Run the script to start DataNode: `./sbin/start-datanode.sh`. If the following prompt appears, the startup is successful: -### clarification + + +4. Enter the `http://localhost:9094/metrics` URL in the browser, and you can view the following monitoring item information: + + + +5. Similarly, the other two DataNodes can be configured to ports 9095 and 9096. + +### 1.1.4 clarification + +Please confirm that the IoTDB cluster has bee
(iotdb-docs) branch main updated: Add docs for explain/explain analyze (#197)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new cdcb1db Add docs for explain/explain analyze (#197)
cdcb1db is described below
commit cdcb1db70bf93965401fa3dfe404b9f56180d156
Author: YangCaiyin
AuthorDate: Mon Apr 1 14:40:45 2024 +0800
Add docs for explain/explain analyze (#197)
---
src/.vuepress/sidebar/V1.3.x/en.ts | 1 +
src/.vuepress/sidebar/V1.3.x/zh.ts | 1 +
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 1 +
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 1 +
src/UserGuide/Master/SQL-Manual/SQL-Manual.md | 9 +
src/UserGuide/Master/User-Manual/Maintennance.md | 239 +
src/UserGuide/latest/SQL-Manual/SQL-Manual.md | 10 +-
src/UserGuide/latest/User-Manual/Maintennance.md | 239 +
src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 10 +-
.../UserGuide/Master/User-Manual/Maintennance.md | 236
src/zh/UserGuide/latest/SQL-Manual/SQL-Manual.md | 11 +-
.../UserGuide/latest/User-Manual/Maintennance.md | 236
12 files changed, 990 insertions(+), 4 deletions(-)
diff --git a/src/.vuepress/sidebar/V1.3.x/en.ts
b/src/.vuepress/sidebar/V1.3.x/en.ts
index b68201a..3b6d283 100644
--- a/src/.vuepress/sidebar/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar/V1.3.x/en.ts
@@ -89,6 +89,7 @@ export const enSidebar = {
{ text: 'Data Sync', link: 'Data-Sync' },
{ text: 'Database Programming', link: 'Database-Programming' },
{ text: 'Authority Management', link: 'Authority-Management' },
+{ text: 'Maintennance', link: 'Maintennance' },
],
},
{
diff --git a/src/.vuepress/sidebar/V1.3.x/zh.ts
b/src/.vuepress/sidebar/V1.3.x/zh.ts
index 57c071c..33118b7 100644
--- a/src/.vuepress/sidebar/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.3.x/zh.ts
@@ -88,6 +88,7 @@ export const zhSidebar = {
{ text: '数据同步', link: 'Data-Sync' },
{ text: '数据库编程', link: 'Database-Programming' },
{ text: '权限管理', link: 'Authority-Management' },
+{ text: '运维语句', link: 'Maintennance' },
],
},
{
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index 1f2d937..d3927dc 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -93,6 +93,7 @@ export const enSidebar = {
{ text: 'Database Programming', link: 'Database-Programming' },
{ text: 'Security Management', link: 'Security-Management_timecho' },
{ text: 'Authority Management', link: 'Authority-Management' },
+{ text: 'Maintennance', link: 'Maintennance' },
],
},
{
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
index df4e412..b34851d 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
@@ -93,6 +93,7 @@ export const zhSidebar = {
{ text: '数据库编程', link: 'Database-Programming' },
{ text: '安全控制', link: 'Security-Management_timecho' },
{ text: '权限管理', link: 'Authority-Management' },
+{ text: '运维语句', link: 'Maintennance' },
],
},
{
diff --git a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md
b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md
index 8d3f4d0..16bacec 100644
--- a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md
+++ b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md
@@ -907,6 +907,15 @@ IoTDB > select * into ::(backup_${4}) from root.sg.**
align by device;
IoTDB > select s1, s2 into root.sg_copy.d1(t1, t2), aligned
root.sg_copy.d2(t1, t2) from root.sg.d1, root.sg.d2 align by device;
```
+## Maintennance
+Generate the corresponding query plan:
+```
+explain select s1,s2 from root.sg.d1
+```
+Execute the corresponding SQL, analyze the execution and output:
+```
+explain analyze select s1,s2 from root.sg.d1 order by s1
+```
## OPERATOR
For more details, see document
[Operator-and-Expression](../User-Manual/Operator-and-Expression.md).
diff --git a/src/UserGuide/Master/User-Manual/Maintennance.md
b/src/UserGuide/Master/User-Manual/Maintennance.md
new file mode 100644
index 000..79e3149
--- /dev/null
+++ b/src/UserGuide/Master/User-Manual/Maintennance.md
@@ -0,0 +1,239 @@
+
+
+# Maintennance
+## Overview
+
+The significance of query analysis lies in assisting users to understand the
execution mechanism and performance bottlenecks of queries, thereby achieving
query optimization and performance improvement. This concerns not only the
efficiency of query execution but also directly affects the user experience of
applications and the effective use of resources. To conduct effective query
analysis, IoTDB provides
(iotdb-docs) branch main updated: Fix the img of workbench (#205)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 0ad41cd Fix the img of workbench (#205) 0ad41cd is described below commit 0ad41cd30872921dbfd3655efa70d07a03b6 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Mon Mar 25 18:57:40 2024 +0800 Fix the img of workbench (#205) --- src/UserGuide/Master/Tools-System/Workbench_timecho.md | 4 ++-- src/UserGuide/latest/Tools-System/Workbench_timecho.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UserGuide/Master/Tools-System/Workbench_timecho.md b/src/UserGuide/Master/Tools-System/Workbench_timecho.md index 8e3ace5..965669b 100644 --- a/src/UserGuide/Master/Tools-System/Workbench_timecho.md +++ b/src/UserGuide/Master/Tools-System/Workbench_timecho.md @@ -31,7 +31,7 @@ Workbench程序启动后，您可以通过输入部署服务器的 IP 和工作 3.4 测点列表 您可以通过界面直观查看、管理测点信息，支持直接查看实例中的所有测点，并查看测点的重要信息 - + 3.5 查询 3.5.1 数据查询 将对常用数据查询场景提供界面式查询，支持进行时间过滤、测点过滤的查询，支持进行降采样查询，支持对查询数据进行批量导出。 @@ -56,4 +56,4 @@ Workbench程序启动后，您可以通过输入部署服务器的 IP 和工作 3.8 权限管理 您可在此模块中配置可以访问数据库的用户，以及该用户可以访问的数据范围，方便对数据库系统的访问进行范围划分。 - + diff --git a/src/UserGuide/latest/Tools-System/Workbench_timecho.md b/src/UserGuide/latest/Tools-System/Workbench_timecho.md index 8e3ace5..965669b 100644 --- a/src/UserGuide/latest/Tools-System/Workbench_timecho.md +++ b/src/UserGuide/latest/Tools-System/Workbench_timecho.md @@ -31,7 +31,7 @@ Workbench程序启动后，您可以通过输入部署服务器的 IP 和工作 3.4 测点列表 您可以通过界面直观查看、管理测点信息，支持直接查看实例中的所有测点，并查看测点的重要信息 - + 3.5 查询 3.5.1 数据查询 将对常用数据查询场景提供界面式查询，支持进行时间过滤、测点过滤的查询，支持进行降采样查询，支持对查询数据进行批量导出。 @@ -56,4 +56,4 @@ Workbench程序启动后，您可以通过输入部署服务器的 IP 和工作 3.8 权限管理 您可在此模块中配置可以访问数据库的用户，以及该用户可以访问的数据范围，方便对数据库系统的访问进行范围划分。 - +
(iotdb-docs) branch main updated: add device description (#204)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 4c924ec add device description (#204) 4c924ec is described below commit 4c924ec9608d85873b1e7f819a70f39e0d5a8f1b Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Mon Mar 25 18:57:32 2024 +0800 add device description (#204) --- src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md| 2 +- src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md| 2 +- src/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md| 2 +- src/zh/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md | 2 +- src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md | 2 +- src/zh/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md b/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md index 92549ac..b67f824 100644 --- a/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md @@ -37,7 +37,7 @@ It is information measured by detection equipment in an actual scene and can tra ### Entity (Also called device) -**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. +**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. Entities do not need to be created manually, the default is the second last layer. ### Database diff --git a/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md b/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md index 684f6b6..3befdcf 100644 --- a/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md @@ -37,7 +37,7 @@ It is information measured by detection equipment in an actual scene and can tra ### Entity (Also called device) -**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. +**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. Entities do not need to be created manually, the default is the second last layer. ### Database diff --git a/src/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md b/src/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md index 92549ac..b67f824 100644 --- a/src/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md @@ -37,7 +37,7 @@ It is information measured by detection equipment in an actual scene and can tra ### Entity (Also called device) -**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. +**An entity** is an equipped with measurements in real scenarios. In IoTDB, all measurements should have their corresponding entities. Entities do not need to be created manually, the default is the second last layer. ### Database diff --git a/src/zh/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md b/src/zh/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md index 6bf8bbe..4df7ef8 100644 --- a/src/zh/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/zh/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md @@ -51,7 +51,7 @@ Database 节点名只支持中英文字符、数字和下划线的组合。例 ## 设备（Device） -**一个物理设备**，也称实体（Entity），是在实际场景中拥有物理量的设备或装置。在 IoTDB 当中，所有的物理量都有其对应的归属实体。实体是管理的一组时间序列的组合，可以是一个物理设备、测量装置、传感器集合等。 +**一个物理设备**，也称实体（Entity），是在实际场景中拥有物理量的设备或装置。在 IoTDB 当中，所有的物理量都有其对应的归属实体。实体无需手动创建，默认为倒数第二层。实体是管理的一组时间序列的组合，可以是一个物理设备、测量装置、传感器集合等。 ## 物理量（Measurement） diff --git a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md index f2823f3..3cd21b3 100644 --- a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md @@ -53,7 +53,7 @@ Database 节点名只支持中英文字符、数字和下划线的组合。例 ## 设备（Device） -**一个物理设备**，也称实体（Entity），是在实际场景中拥有物理量的设备或装置。在 IoTDB 当中，所有的物理量都有其对应的归属实体。实体是管理的一组时间序列的组合，可以是一个物理设备、测量装置、传感器集合等。 +**一个物理设备**，也称实体（Entity），是在实际场景中拥有物理量的设备或装置。在 IoTDB 当中，所有的物理量都有其对应的归属实体。实体无需手动创建，默认为倒数第二层。实体是管理的一组时间序列的组合，可以是一个物理设备、测量装置、传感器集合等。 ## 物理量（Measurement） diff --git a/src/zh/UserGuide/latest/Basic-Concept/Data-Model-and-Terminology.md b/src/zh/UserGuide/latest/Basic-Concept/Data
(iotdb-docs) branch main updated: add the content of cpp compile error (#187)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new ff6d733 add the content of cpp compile error (#187) ff6d733 is described below commit ff6d7332ebe51f4f7120354c9b0b0e94981ea33b Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Mar 7 12:02:51 2024 +0800 add the content of cpp compile error (#187) --- .../Master/API/Programming-Cpp-Native-API.md | 616 +++-- .../latest/API/Programming-Cpp-Native-API.md | 311 +++ .../Master/API/Programming-Cpp-Native-API.md | 314 ++- .../latest/API/Programming-Cpp-Native-API.md | 310 +++ 4 files changed, 1373 insertions(+), 178 deletions(-) diff --git a/src/UserGuide/Master/API/Programming-Cpp-Native-API.md b/src/UserGuide/Master/API/Programming-Cpp-Native-API.md index 6302bfc..41b9f8c 100644 --- a/src/UserGuide/Master/API/Programming-Cpp-Native-API.md +++ b/src/UserGuide/Master/API/Programming-Cpp-Native-API.md @@ -22,16 +22,14 @@ # C++ Native API ## Dependencies - - Java 8+ -- Maven 3.9+ (optional when using `mvnw` command) +- Maven 3.5+ - Flex - Bison 2.7+ - Boost 1.56+ - OpenSSL 1.0+ - GCC 5.5.0+ -> Even if we'll be building a C++ application, we still need `Maven` for the build and that requires `Java` ## Installation From Source Code @@ -39,46 +37,50 @@ - **MAC** -1. Install Homebrew, as we'll be installing all dependencies via that. -```shell -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -``` -2. Make sure java ist installed, if not: -```shell -brew install java -``` - Please pay attention to the output of the installation process. - It will probably note that you need to create a symlink: -1. On Intel-based models: - ```shell - sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk - ``` -2. On Arm-based models - ```shell - sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk - ``` -3. Install Bison：Bison 2.3 is preinstalled on OSX, but this version is outdated, and we need a newer version. +1. Install Bison ：Bison 2.3 is preinstalled on OSX, but this version is too low. + + When building Thrift with Bison 2.3, the following error would pop out: + ```invalid directive: '%code'``` + + For such case, please update `Bison`: ```shell brew install bison + brew link bison --force ``` -4. Install Boost：Please make sure a relative new version of Boost is ready on your machine. - If no Boost available, install the latest version of Boost: - ```shell - brew install boost - ``` -5. OpenSSL ：Make sure the Openssl header files and libraries have been installed on your Mac. The default Openssl include file search path is "/usr/local/opt/openssl/include". - ```shell - brew install openssl - ``` + + Then, you need to tell the OS where the new bison is. + + For Bash users: + ```shell + echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile + ``` + + For zsh users: + ```shell + echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.zshrc + ``` + +2. Install Boost ：Please make sure a relative new version of Boost is ready on your machine. + If no Boost available, install the latest version of Boost: + ```shell + brew install boost + brew link boost + ``` + +3. OpenSSL ：Make sure the Openssl libraries has been install on your Mac. The default Openssl include file search path is "/usr/local/opt/openssl/include". + + If Openssl header files can not be found when building Thrift, please add option`-Dopenssl.include.dir=""`. + - **Ubuntu 20** To install all dependencies, run: ```shell -sudo apt install default-jdk bison flex libboost-all-dev libssl-dev +sudo apt-get install gcc-9 g++-9 libstdc++-9-dev bison flex libboost-all-dev libssl-dev zlib1g-dev ``` + - **CentOS 7.x** Some packages can be installed using Yum: @@ -89,93 +91,398 @@ The version of gcc and boost installed by yum is too low, therefore you should compile or download these binary packages by yourself. + - **Windows** -1. Install Chocolatey, as we'll be installing all dependencies via that: [Installation Instructions](https://chocolatey.org/install) +1. Building environment +
(iotdb-docs) branch main updated: Fix the introduction doc img of English version (#179)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 6f97323 Fix the introduction doc img of English version (#179) 6f97323 is described below commit 6f97323324357a01bae63c61e2d6f3147fc49701 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Mar 7 12:01:20 2024 +0800 Fix the introduction doc img of English version (#179) --- src/UserGuide/Master/IoTDB-Introduction/Scenario.md | 10 +- src/UserGuide/V1.2.x/IoTDB-Introduction/Scenario.md | 10 +- src/UserGuide/latest/IoTDB-Introduction/Scenario.md | 10 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/UserGuide/Master/IoTDB-Introduction/Scenario.md b/src/UserGuide/Master/IoTDB-Introduction/Scenario.md index 469e8b2..60bbc09 100644 --- a/src/UserGuide/Master/IoTDB-Introduction/Scenario.md +++ b/src/UserGuide/Master/IoTDB-Introduction/Scenario.md @@ -36,7 +36,7 @@ In the original architecture, the HBase cluster was used as the storage database The data management architecture of the car company using IoTDB as the time-series data storage engine is shown in the figure below. - + The vehicle data is encoded based on TCP and industrial protocols and sent to the edge gateway, and the gateway sends the data to the message queue Kafka cluster, decoupling the two ends of production and consumption. Kafka sends data to Flink for real-time processing, and the processed data is written into IoTDB. Both historical data and latest data are queried in IoTDB, and finally the data flows into the visualization platform through API for application. @@ -59,7 +59,7 @@ After selecting IoTDB as the storage database of the intelligent operation and m The figure below shows the architecture design of the intelligent operation and maintenance platform of the steel plant. -.PNG) + ## Application 3: Smart Factory @@ -73,7 +73,7 @@ A cigarette factory hopes to upgrade from a "traditional factory" to a "high-end The figure below shows the factory's IoT system architecture. IoTDB runs through the three-level IoT platform of the company, factory, and workshop to realize unified joint debugging and joint control of equipment. The data at the workshop level is collected, processed and stored in real time through the IoTDB at the edge layer, and a series of analysis tasks are realized. The preprocessed data is sent to the IoTDB at the platform layer for data governance at the business level, such as [...] -.PNG) + ## Application 4: Condition monitoring @@ -84,11 +84,11 @@ The figure below shows the factory's IoT system architecture. IoTDB runs through A power plant needs to monitor tens of thousands of measuring points of main and auxiliary equipment such as fan boiler equipment, generators, and substation equipment. In the previous heating process, there was a lack of prediction of the heat supply in the next stage, resulting in ineffective heating, overheating, and insufficient heating. -After using IoTDB as the storage and analysis engine, combined with meteorological data, building control data, household control data, heat exchange station data, official website data, heat source side data, etc., all data are time-aligned in IoTDB to provide reliable data basis to realize smart heating. At the same time, it also solves the problem of monitoring the working conditions of various important components in the relevant heating process, such as on-demand billing and pipe ne [...] +After using IoTDB as the storage and analysis engine, combined with meteorological data, building control data, household control data, heat exchange station data, official website data, heat source side data, etc., all data are time-aligned in IoTDB to provide reliable data basis to realize smart heating. At the same time, it also solves the problem of monitoring the working conditions of various important components in the relevant heating process, such as on-demand billing and pipe ne [...] ### Architecture The figure below shows the data management architecture of the power plant in the heating scene. - + diff --git a/src/UserGuide/V1.2.x/IoTDB-Introduction/Scenario.md b/src/UserGuide/V1.2.x/IoTDB-Introduction/Scenario.md i
(iotdb-docs) branch main updated: fix some docbugs of latest version (#189)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new ec4b66c fix some docbugs of latest version (#189) ec4b66c is described below commit ec4b66c829f14818c508609dc186c4da4686c0d6 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Mar 7 12:01:01 2024 +0800 fix some docbugs of latest version (#189) --- .../Master/API/Programming-Python-Native-API.md| 136 - .../Master/QuickStart/ClusterQuickStart.md | 2 +- src/UserGuide/Master/QuickStart/QuickStart.md | 6 +- .../latest/API/Programming-Python-Native-API.md| 4 +- .../latest/QuickStart/ClusterQuickStart.md | 2 +- src/UserGuide/latest/QuickStart/QuickStart.md | 6 +- .../Master/API/Programming-Python-Native-API.md| 4 +- .../Master/IoTDB-Introduction/Scenario.md | 2 +- .../Master/QuickStart/ClusterQuickStart.md | 4 +- src/zh/UserGuide/Master/QuickStart/QuickStart.md | 6 +- .../latest/API/Programming-Python-Native-API.md| 4 +- .../latest/IoTDB-Introduction/Scenario.md | 2 +- .../latest/QuickStart/ClusterQuickStart.md | 4 +- src/zh/UserGuide/latest/QuickStart/QuickStart.md | 8 +- 14 files changed, 103 insertions(+), 87 deletions(-) diff --git a/src/UserGuide/Master/API/Programming-Python-Native-API.md b/src/UserGuide/Master/API/Programming-Python-Native-API.md index 8bbadb4..b17d73e 100644 --- a/src/UserGuide/Master/API/Programming-Python-Native-API.md +++ b/src/UserGuide/Master/API/Programming-Python-Native-API.md @@ -21,13 +21,19 @@ # Python Native API +## Requirements + +You have to install thrift (>=0.13) before using the package. + + + ## How to use (Example) First, download the package: `pip3 install apache-iotdb` -You can see an example of how to use the package to read and write data here: [Example](https://github.com/apache/iotdb/blob/master/client-py/SessionExample.py) +You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionExample.py) -An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/client-py/SessionAlignedTimeseriesExample.py) +An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionAlignedTimeseriesExample.py) (you need to add `import iotdb` in the head of the file) @@ -81,7 +87,7 @@ session = Session.init_from_node_urls( session.open(enable_rpc_compression=False) ``` -Notice: The RPC compression setting of the client is required to match that of the IoTDB server +Notice: this RPC compression status of client must comply with that of IoTDB server * Close a Session @@ -90,11 +96,7 @@ session.close() ``` ## Managing Session through SessionPool -Utilizing `SessionPool` to manage sessions eliminates the need to worry about session reuse. -When the number of session connections reaches the maximum capacity of the pool, requests for acquiring a session will block. -You can set a timeout after which new requests are considered unsuccessful. - -After using a session, it should always be returned to the SessionPool using the `putBack` method for proper management. +Utilizing SessionPool to manage sessions eliminates the need to worry about session reuse. When the number of session connections reaches the maximum capacity of the pool, requests for acquiring a session will be blocked, and you can set the blocking wait time through parameters. After using a session, it should be returned to the SessionPool using the `putBack` method for proper management. ### Create SessionPool @@ -108,9 +110,7 @@ wait_timeout_in_ms = 3000 # # Create the connection pool session_pool = SessionPool(pool_config, max_pool_size, wait_timeout_in_ms) ``` - -### Create a SessionPool using distributed nodes - +### Create a SessionPool using distributed nodes. ```python pool_config = PoolConfig(node_urls=node_urls=["127.0.0.1:6667", "127.0.0.1:6668", "127.0.0.1:6669"], user_name=username, password=password, fetch_size=1024, @@ -118,7 +118,6 @@ pool_config = PoolConfig(node_urls=node_urls=["127.0.0.1:6667", "127.0.0.1:6668" max_pool_size = 5 wait_timeout_in_ms = 3000 ``` - ### Acquiring a session through SessionPool and manually calling PutBack after use ```python @@ -133,7 +132,7 @@ session_pool.put_back(session) session_pool.close() ``` -## Data Definition Interface (DDI) +## Data Definition Interface (DDL Interface) ### Database Management @@ -189,12 +188,13 @@ session.check_time_series_exists(pa
(iotdb) branch master updated: [IOTDB-6305] Add show current_timestamp statement (#12106)
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 2b066d817f7 [IOTDB-6305] Add show current_timestamp statement (#12106)
2b066d817f7 is described below
commit 2b066d817f72cdfe41052110380d7d655c1fea5c
Author: 张宇欣 <545952...@qq.com>
AuthorDate: Sat Mar 2 12:52:40 2024 +0800
[IOTDB-6305] Add show current_timestamp statement (#12106)
---
.../iotdb/db/it/IoTDBSimpleQueryStandaloneIT.java | 75 ++
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 10 ++-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 ++
.../common/header/ColumnHeaderConstant.java| 6 ++
.../common/header/DatasetHeaderFactory.java| 4 ++
.../queryengine/plan/analyze/AnalyzeVisitor.java | 11
.../memory/StatementMemorySourceVisitor.java | 16 +
.../db/queryengine/plan/parser/ASTVisitor.java | 6 ++
.../plan/statement/StatementVisitor.java | 6 ++
.../metadata/ShowCurrentTimestampStatement.java| 29 +
11 files changed, 166 insertions(+), 2 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryStandaloneIT.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryStandaloneIT.java
new file mode 100644
index 000..3167cc00e23
--- /dev/null
+++
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryStandaloneIT.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.it;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class})
+public class IoTDBSimpleQueryStandaloneIT {
+
+ @Before
+ public void setUp() throws Exception {
+EnvFactory.getEnv().initClusterEnvironment();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+
+ @Test
+ public void showCurrentTimestamp() {
+try (Connection connection = EnvFactory.getEnv().getConnection();
+Statement statement = connection.createStatement()) {
+ long startTime = System.currentTimeMillis();
+ long rowCount = 0;
+ try (ResultSet r1 = statement.executeQuery("show current_timestamp")) {
+long currentTime = 0;
+while (r1.next()) {
+ rowCount++;
+ currentTime = r1.getLong(1);
+ assertTrue(currentTime >= startTime);
+}
+assertEquals(1, r1.getMetaData().getColumnCount());
+assertEquals(1, rowCount);
+ }
+} catch (SQLException e) {
+ fail();
+}
+ }
+}
diff --git
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
index 7b1ca692ed1..2b3a3ebca0f 100644
---
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
+++
b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IdentifierParser.g4
@@ -256,4 +256,5 @@ keyWords
| WRITE
| AUDIT
| OPTION
+| CURRENT_TIMESTAMP
;
\ No newline at end of file
diff --git
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
b/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 8396889efb2..47e798b80c2 100644
---
a/iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++
(iotdb-docs) branch main updated: fix table form (#185)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 00bbbf7 fix table form (#185)
00bbbf7 is described below
commit 00bbbf74cadc4d4bec0a67f1ddf1ee5170a97b94
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Thu Feb 29 16:02:45 2024 +0800
fix table form (#185)
---
src/zh/Development/Community-Project-Committers.md | 64 +++---
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/zh/Development/Community-Project-Committers.md
b/src/zh/Development/Community-Project-Committers.md
index 6f6c567..c497c7c 100644
--- a/src/zh/Development/Community-Project-Committers.md
+++ b/src/zh/Development/Community-Project-Committers.md
@@ -20,39 +20,39 @@
-->
# 成为开发者
## 开发人员
-### Project PMC
-| id |githubUsername |public name| starting date |
-| :: | :---: | :---: | :---: |
:-: |
-|wangchen| | Chen Wang | 2020/9/16 |
|
-| cdutz | chrisdutz | Christofer Dutz | 2020/9/16 |
|
-| liudw | liutaohua | Dawei Liu | 2020/9/16 |
|
-| caogaofei|Beyyes |Gaofei Cao | 2020/9/16 |
|
-| haonan | HTHou |Haonan Hou | 2020/9/16 |
|
-| qiaojialin | qiaojialin |Jialin Qiao| 2020/9/16 |
|
-| jimwang (*) | | Jianmin Wang| 2020/9/16 |
|
-|jincheng|sunjincheng121 | Jincheng Sun| 2020/9/16 |
|
-| xingtanzjr (*) | xingtanzjr | Jinrui Zhang| 2020/9/16 |
|
-| jfeinauer|JulianFeinauer | Julian Feinauer | 2020/9/16 |
|
-|yuanjun | | Jun Yuan | 2020/9/16 |
|
-|jmclean | justinmclean, jmclean | Justin Mclean | 2020/9/16 |
|
-|kmcgrail| | Kevin A. McGrail | 2020/9/16 |
|
-| liukun | liukun4515 | Kun Liu | 2020/9/16 |
|
-| leirui |LeiRui | Lei Rui | 2020/9/16 |
|
-|kangrong| kr11 | Rong Kang | 2020/9/16 |
|
-| liurui | liuruiyiyang | Rui Liu | 2020/9/16 |
|
-| shuozhang| |Shuo Zhang | 2020/9/16 |
|
-| zhaoxinyi (*) | StefanieZhao7 | Stefanie Zhao | 2020/9/16 |
|
-| jiangtian| jt2594838 |Tian Jiang | 2020/9/16 |
|
-| lta | fanhualta | Tianan Li | 2020/9/16 |
|
-| ningjiang| WillemJiang | Willem Ning Jiang | 2020/9/16 |
|
-| hxd | jixuan1989 | Xiangdong Huang | 2020/9/16 |
<=chair |
-| chaow |mychaow| Chao Wang | 2021/6/2|
|
-|neuyilan| neuyilan|Houliang Qi| 2021/12/24 |
|
-| jackietien | JackieTien97 | Yuan Tian | 2022/4/21 |
|
-| wangchao316 | wangchao316 | Chao Wang | 2022/12/12 |
|
-| rong | SteveYurongSu | Steve Yurong Su | 2023/9/28 |
|
-|tanxinyu| OneSizeFitsQuorum | Xinyu Tan | 2023/9/28 |
|
+### Project PMC |
+| id | githubUsername | public name | starting
date |
+| : | :---: | :---: |
:-: |
+| wangchen | | Chen Wang | 2020/9/16
|
+|cdutz |chrisdutz | Christofer Dutz |
2020/9/16 |
+| liudw |liutaohua | Dawei Liu |
2020/9/16 |
+|caogaofei
(iotdb-docs) branch main updated: Fix the doc of English version (#177)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new fcc9d43 Fix the doc of English version (#177) fcc9d43 is described below commit fcc9d43c28461ef7c2e17ea4a4f3791b51554cab Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Feb 7 12:43:32 2024 +0800 Fix the doc of English version (#177) --- .../Master/API/Programming-Java-Native-API.md | 167 ++--- .../Basic-Concept/Encoding-and-Compression.md | 2 +- .../Deployment-Guide_timecho.md| 4 +- .../Master/User-Manual/Operate-Metadata.md | 4 +- .../Master/User-Manual/Operator-and-Expression.md | 4 +- src/UserGuide/Master/User-Manual/Query-Data.md | 2 +- .../latest/API/Programming-Java-Native-API.md | 2 +- .../Basic-Concept/Encoding-and-Compression.md | 2 +- .../Deployment-Guide_timecho.md| 4 +- .../latest/User-Manual/Operate-Metadata.md | 4 +- .../latest/User-Manual/Operator-and-Expression.md | 4 +- src/UserGuide/latest/User-Manual/Query-Data.md | 2 +- .../Master/User-Manual/Operate-Metadata.md | 2 +- .../latest/User-Manual/Operate-Metadata.md | 2 +- 14 files changed, 95 insertions(+), 110 deletions(-) diff --git a/src/UserGuide/Master/API/Programming-Java-Native-API.md b/src/UserGuide/Master/API/Programming-Java-Native-API.md index 4b55318..4fe0bee 100644 --- a/src/UserGuide/Master/API/Programming-Java-Native-API.md +++ b/src/UserGuide/Master/API/Programming-Java-Native-API.md @@ -25,8 +25,8 @@ ### Dependencies -* JDK >= 1.8+ -* Maven >= 3.9+ +* JDK >= 1.8 +* Maven >= 3.6 ### How to install @@ -47,15 +47,15 @@ In root directory: ## Syntax Convention -- **IoTDB-SQL interface:** The input SQL parameter needs to conform to the [syntax conventions](../stage/Syntax-Conventions/Literal-Values.md) and be escaped for JAVA strings. For example, you need to add a backslash before the double-quotes. (That is: after JAVA escaping, it is consistent with the SQL statement executed on the command line.) +- **IoTDB-SQL interface:** The input SQL parameter needs to conform to the [syntax conventions](../User-Manual/Syntax-Rule.md#Literal-Values) and be escaped for JAVA strings. For example, you need to add a backslash before the double-quotes. (That is: after JAVA escaping, it is consistent with the SQL statement executed on the command line.) - **Other interfaces:** - - The node names in path or path prefix: The node names are required to be escaped by backticks (`) in the SQL statement. - - Identifiers (such as template names): The identifiers are required to be escaped by backticks (`) in the SQL statement. + - The node names in path or path prefix as parameter: The node names which should be escaped by backticks (`) in the SQL statement, escaping is required here. + - Identifiers (such as template names) as parameters: The identifiers which should be escaped by backticks (`) in the SQL statement, and escaping is not required here. - **Code example for syntax convention could be found at:** `example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java` ## Native APIs -In this section we will demonstrate the commonly used interfaces and their parameters in the Native API: +Here we show the commonly used interfaces and their parameters in the Native API: ### Initialization @@ -91,7 +91,7 @@ session = .build(); ``` -`Version` represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of `0.12` when upgrading `0.13`. The possible values are: `V_0_12`, `V_0_13`, `V_1_0`. +Version represents the SQL semantic version used by the client, which is used to be compatible with the SQL semantics of 0.12 when upgrading 0.13. The possible values are: `V_0_12`, `V_0_13`, `V_1_0`. * Open a Session @@ -99,13 +99,13 @@ session = void open() ``` -* Open a session, with a parameter specifying whether to enable RPC compression +* Open a session, with a parameter to specify whether to enable RPC compression ``` java void open(boolean enableRPCCompression) ``` -Notice: The RPC compression setting of the client is required to match that of the IoTDB server +Notice: this RPC compression status of client must comply with that of IoTDB server * Close a Session @@ -113,11 +113,11 @@ Notice: The RPC compression setting of the client is required to match that of t void close() ``` -### Data Definition Interface (DDI) +### Data Definition Interface (DDL Interface) Database Management -* Create database +* CREATE DATABASE ``` java void setStorageGroup(String storageGroupId) @@ -169,8 +169,8 @@ boolean checkTimes
(iotdb-docs) branch main updated: Fill in the missing questions (#175)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 3364ac0 Fill in the missing questions (#175) 3364ac0 is described below commit 3364ac019d6a04821b281812531fbd00c926f58b Author: Tanxilo <101696091+tanx...@users.noreply.github.com> AuthorDate: Wed Feb 7 10:19:00 2024 +0800 Fill in the missing questions (#175) --- .../Master/User-Manual/Database-Programming.md | 10 - src/UserGuide/Master/User-Manual/Streaming.md | 18 .../Master/User-Manual/Streaming_timecho.md| 16 +++ .../latest/User-Manual/Database-Programming.md | 10 - src/UserGuide/latest/User-Manual/Streaming.md | 18 .../latest/User-Manual/Streaming_timecho.md| 16 +++ .../Master/User-Manual/Streaming_timecho.md| 24 +++--- .../latest/User-Manual/Streaming_timecho.md| 24 +++--- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/Database-Programming.md b/src/UserGuide/Master/User-Manual/Database-Programming.md index 74dcda8..0ce6cf7 100644 --- a/src/UserGuide/Master/User-Manual/Database-Programming.md +++ b/src/UserGuide/Master/User-Manual/Database-Programming.md @@ -1545,13 +1545,13 @@ SHOW FUNCTIONS ### User Permission Management -There are 3 types of user permissions related to UDF: +There are 1 types of user permissions related to UDF: `USE_UDF` -* `USE_UDF`: Only users with this permission are allowed to register UDFs -* `DROP_FUNCTION`: Only users with this permission are allowed to deregister UDFs -* `READ_TIMESERIES`: Only users with this permission are allowed to use UDFs for queries +* Only users with this permission are allowed to register UDFs +* Only users with this permission are allowed to deregister UDFs +* Only users with this permission are allowed to use UDFs for queries -For more user permissions related content, please refer to [Account Management Statements](../Administration-Management/Administration.md). +For more user permissions related content, please refer to [Account Management Statements](./Authority-Management.md). diff --git a/src/UserGuide/Master/User-Manual/Streaming.md b/src/UserGuide/Master/User-Manual/Streaming.md index 21bb1cf..d911ee8 100644 --- a/src/UserGuide/Master/User-Manual/Streaming.md +++ b/src/UserGuide/Master/User-Manual/Streaming.md @@ -631,7 +631,7 @@ The expressed semantics are: synchronise the full amount of historical data and 'connector.thrift.host' = 'localhost', 'connector.thrift.port' = '', ) - + CREATE PIPE pipe2 WITH CONNECTOR ( 'connector' = 'iotdb-thrift-connector', @@ -725,19 +725,19 @@ The following diagram illustrates the different states and their transitions: | Authority Name| Description | | --- | | -| CREATE_PIPE | Register task,path-independent | -| START_PIPE | Start task,path-independent | -| STOP_PIPE | Stop task,path-independent | -| DROP_PIPE | Uninstall task,path-independent | -| SHOW_PIPES | Query task,path-independent | +| USE_PIPE | Register task,path-independent | +| USE_PIPE | Start task,path-independent | +| USE_PIPE | Stop task,path-independent | +| USE_PIPE | Uninstall task,path-independent | +| USE_PIPE | Query task,path-independent | ### Stream Processing Task Plugin | Authority Name | Description | | - | -- | -| CREATE_PIPEPLUGIN | Register stream processing task plugin,path-independent | -| DROP_PIPEPLUGIN | Delete stream processing task plugin,path-independent | -| SHOW_PIPEPLUGINS | Query stream processing task plugin,path-independent | +| USE_PIPE | Register stream processing task plugin,path-independent | +| USE_PIPE | Delete stream processing task plugin,path-independent | +| USE_PIPE | Query stream processing task plugin,path-independent | ## Configure Parameters diff --git a/src/UserGuide/Master/User-Manual/Streaming_timecho.md b/src/UserGuide/Master/User-Manual/Streaming_timecho.md index 6c4a633..8d12131 100644 --- a/src/UserGuide/Master/User-Manual/Streaming_timecho.md +++ b/src/UserGuide/Master/User-Manual/Streaming_timecho.md @@ -769,20 +769,20 @@ The following diagram shows all states and state transitions: | Permission name | Description | | --- | -- | -| CREATE_PIPE | Register a stream processing task. The path is irrelevant. | -| START_PIPE | Start the stream processing task. The path is irrelevant. | -| STOP_PIPE | Stop the stream processing task. The path is irrelevant. | -| DROP_PIPE | Offload stream processing tasks. The path is irrelevant. | -| SHOW_PIPES | Query stream processing
(iotdb-docs) branch main updated: adjust the FAQ doc of V1.2、latest and master version (#176)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new b1f50d2 adjust the FAQ doc of V1.2、latest and master version (#176) b1f50d2 is described below commit b1f50d2da0995c0c4e53e57fae33c2bfaa1159c8 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Feb 7 10:18:48 2024 +0800 adjust the FAQ doc of V1.2、latest and master version (#176) --- src/UserGuide/Master/API/RestServiceV1.md | 2 +- .../Deployment-Guide_timecho.md| 4 +- .../Master/FAQ/Frequently-asked-questions.md | 19 ++ src/UserGuide/Master/SQL-Manual/SQL-Manual.md | 309 ++--- src/UserGuide/Master/User-Manual/AINode_timecho.md | 2 +- src/UserGuide/Master/User-Manual/Query-Data.md | 4 +- .../Deployment-Guide_timecho.md| 6 +- .../V1.2.x/FAQ/Frequently-asked-questions.md | 19 ++ src/UserGuide/latest/API/RestServiceV1.md | 2 +- .../Deployment-Guide_timecho.md| 4 +- .../latest/FAQ/Frequently-asked-questions.md | 19 ++ src/UserGuide/latest/SQL-Manual/SQL-Manual.md | 305 ++-- src/UserGuide/latest/User-Manual/AINode_timecho.md | 2 +- src/UserGuide/latest/User-Manual/Query-Data.md | 4 +- .../Master/FAQ/Frequently-asked-questions.md | 14 +- src/zh/UserGuide/Master/Tools-System/Benchmark.md | 54 ++-- .../V1.2.x/FAQ/Frequently-asked-questions.md | 14 +- src/zh/UserGuide/V1.2.x/Tools-System/Benchmark.md | 4 +- src/zh/UserGuide/latest/API/RestServiceV1.md | 2 +- .../latest/FAQ/Frequently-asked-questions.md | 29 +- src/zh/UserGuide/latest/SQL-Manual/SQL-Manual.md | 3 +- src/zh/UserGuide/latest/Tools-System/Benchmark.md | 2 +- 22 files changed, 312 insertions(+), 511 deletions(-) diff --git a/src/UserGuide/Master/API/RestServiceV1.md b/src/UserGuide/Master/API/RestServiceV1.md index 34af056..b5fdd1c 100644 --- a/src/UserGuide/Master/API/RestServiceV1.md +++ b/src/UserGuide/Master/API/RestServiceV1.md @@ -32,7 +32,7 @@ RESTful services are disabled by default. * User - Find the `conf/iotdb.rest.properties` file under the IoTDB installation directory and set `enable_rest_service` to `true` to enable the module. + Find the `conf/iotdb-datanode.properties` file under the IoTDB installation directory and set `enable_rest_service` to `true` to enable the module. ```properties enable_rest_service=true diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 40ff39a..7c4191f 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -160,10 +160,10 @@ IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -XX:MaxGCPauseMillis=200" | parameter name | parameter describe | required | |-|---|--| | name| Confignode name | YES | -| deploy\_dir | IoTDB config node deployment directory | YES｜ | +| deploy\_dir | IoTDB config node deployment directory | YES | | iotdb-confignode.properties | Corresponding to `iotdb/config/iotdb-confignode.properties`, please refer to the `iotdb-confignode.properties` file description for more details. | NO | | cn\_internal\_address | Corresponds to iotdb/internal communication address, corresponding to `cn_internal_address` in `iotdb/config/iotdb-confignode.properties` | YES | -| cn_\internal\_address | The cluster configuration address points to the surviving ConfigNode, and it points to confignode_x by defaul
(iotdb-docs) branch main updated (fb5aa43 -> 4684ff3)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
from fb5aa43 add the AINode deploy doc (#162)
add 4684ff3 perf(Development) (#178)
No new revisions were added by this update.
Summary of changes:
src/.vuepress/navbar/zh.ts | 16 +-
src/zh/Community/About.md | 169
src/zh/Community/Community-Project-Committers.md | 25 --
src/zh/Community/Feedback.md | 66 +--
src/zh/Community/Materials.md | 90
src/zh/Development/Committer.md| 76
src/zh/Development/Community-Project-Committers.md | 107 +
src/zh/Development/ContributeGuide.md | 179
src/zh/Development/Development-Guide.md| 470 +
src/zh/Development/HowToCommit.md | 155 ---
src/zh/Development/HowToJoin.md| 65 ---
src/zh/Development/HowtoContributeCode.md | 154 ---
.../Powered-By.md} | 22 +-
src/zh/Development/VoteRelease.md | 189 -
src/zh/Development/format-changelist.md| 56 ---
src/zh/Development/rpc-changelist.md | 210 -
16 files changed, 818 insertions(+), 1231 deletions(-)
delete mode 100644 src/zh/Community/Community-Project-Committers.md
create mode 100644 src/zh/Community/Materials.md
delete mode 100644 src/zh/Development/Committer.md
create mode 100644 src/zh/Development/Community-Project-Committers.md
delete mode 100644 src/zh/Development/ContributeGuide.md
create mode 100644 src/zh/Development/Development-Guide.md
delete mode 100644 src/zh/Development/HowToCommit.md
delete mode 100644 src/zh/Development/HowToJoin.md
delete mode 100644 src/zh/Development/HowtoContributeCode.md
rename src/zh/{Community/Community-Powered-By.md => Development/Powered-By.md}
(59%)
delete mode 100644 src/zh/Development/VoteRelease.md
delete mode 100644 src/zh/Development/format-changelist.md
delete mode 100644 src/zh/Development/rpc-changelist.md
(iotdb-docs) branch main updated: add the AINode deploy doc (#162)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new fb5aa43 add the AINode deploy doc (#162)
fb5aa43 is described below
commit fb5aa43cb60448b925f9465e19baefb877286f72
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Fri Feb 2 11:40:44 2024 +0800
add the AINode deploy doc (#162)
---
src/UserGuide/Master/API/Programming-TsFile-API.md | 529 -
.../Deployment-Guide_timecho.md| 315 +++-
.../Deployment-Guide_timecho.md| 312 +++-
3 files changed, 622 insertions(+), 534 deletions(-)
diff --git a/src/UserGuide/Master/API/Programming-TsFile-API.md
b/src/UserGuide/Master/API/Programming-TsFile-API.md
deleted file mode 100644
index 4ee7b4d..000
--- a/src/UserGuide/Master/API/Programming-TsFile-API.md
+++ /dev/null
@@ -1,529 +0,0 @@
-
-
-# TsFile API
-
-`TsFile` is a file format of time series used in IoTDB.
-This document introduces the usage of this file format.
-
-## TsFile library Installation
-
-There are several ways to use TsFile in your own project.
-
-* Build from source and use the jars:
- ```shell
- git clone https://github.com/apache/iotdb.git
- cd iotdb-core/tsfile
- mvn clean package -DskipTests
- ```
- Then, all the jars are located in the folder named `target/`. Import
`target/tsfile-0.12.0-jar-with-dependencies.jar` into your project.
-* Build from source and use as maven dependency:
- Compile source codes and deploy to your local repository in three steps:
- * Get the source codes
- ```shell
- git clone https://github.com/apache/iotdb.git
- cd iotdb-core/tsfile
- mvn clean install -DskipTests
- ```
- * Add the following dependency into your project:
-```xml
-
- org.apache.iotdb
- tsfile
- 1.0.0
-
-```
-* Download the convenience binaries available from Maven-Central:
- * (If you want to reference the latest SNAPSHOT versions, you need to
execute this step)
-Add the `Apache Snapshot Repository` to your projects main `pom.xml`:
-```xml
-
-
-apache.snapshots
-Apache Development Snapshot Repository
-
https://repository.apache.org/content/repositories/snapshots/
-
-false
-
-
-true
-
-
-
-```
-Alternately, find or create your maven `settings.xml` located at:
`${username}\.m2\settings.xml`, add this `` to ``:
-```xml
-
-allow-snapshots
-
-true
-
-
-
-apache.snapshots
-Apache Development Snapshot Repository
-
https://repository.apache.org/content/repositories/snapshots/
-
-false
-
-
-true
-
-
-
-
-```
- * Then add dependency into your project:
-```xml
-
- org.apache.iotdb
- tsfile
- 1.0.0
-
-```
-
-## TsFile Usage
-
-This section demonstrates the detailed usages of TsFile.
-
-Time-series data is considered as a sequence of quadruples. A quadruple is
defined as (device, measurement, time, value).
-
-* **measurement**: A physical or formal measurement that a time-series data
takes, e.g. the temperature of a city, the sales number of some goods or the
speed of a train at different times.
- As a traditional sensor (like a thermometer) also produces a single
measurement which we can use to create a time-series, we will use measurement
and sensor interchangeably below.
-
-* **device**: A device refers to an entity that produces one or multiple
measurements (producing multiple time-series), e.g.,
- a running train monitors its speed, oil meter, miles it has run, current
passengers.
- Each is persisted to a time-series dataset.
-
-* **Row of Data**: In many industrial applications, a device normally contains
more than one sensor and these sensors may have values at the same timestamp,
which is called `row of data`.
- Formally, a `row of data` consists of a `device_id`, a `timestamp` which
indicates the milliseconds since `January 1, 1970, 00:00:00`, and several data
pairs composed of `measurement_id` and corresponding `value`.
- All data pairs in a line of data belong to the same `device_id` and have the
same timestamp.
- If one of the `measurements` does not have a `value` in the `timestamp`, a
space is used instead (Actually, TsFile does not actually store `null` values).
- Its format is shown as follows:
- ```
- device_id, timestamp, ...
- ```
- An example is illustrated as follows.
- In this example, the data type
(iotdb-docs) branch main updated: fix some erros in Engilish version and zh (#174)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 3c599ba fix some erros in Engilish version and zh (#174) 3c599ba is described below commit 3c599baeb51a0a7e485ec525c248ed99bf4c9575 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Fri Feb 2 11:31:29 2024 +0800 fix some erros in Engilish version and zh (#174) --- src/UserGuide/Master/API/RestServiceV2.md | 16 +--- src/UserGuide/Master/Reference/Keywords.md | 2 + .../Master/Tools-System/Import-Export-Tool.md | 8 +- .../Master/User-Manual/Operate-Metadata.md | 98 +++--- .../V1.2.x/FAQ/Frequently-asked-questions.md | 2 +- .../V1.2.x/Tools-System/Import-Export-Tool.md | 4 +- src/UserGuide/latest/API/RestServiceV2.md | 2 +- src/UserGuide/latest/Reference/Keywords.md | 2 + .../latest/Tools-System/Import-Export-Tool.md | 8 +- .../latest/User-Manual/Operate-Metadata.md | 96 ++--- src/zh/UserGuide/Master/API/RestServiceV2.md | 16 +--- .../Deployment-Guide_timecho.md| 4 +- .../Master/FAQ/Frequently-asked-questions.md | 20 + src/zh/UserGuide/Master/Reference/Keywords.md | 2 + src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 62 +++--- .../Master/Tools-System/Import-Export-Tool.md | 4 +- .../UserGuide/Master/User-Manual/AINode_timecho.md | 2 +- src/zh/UserGuide/Master/User-Manual/Query-Data.md | 6 +- .../V1.2.x/FAQ/Frequently-asked-questions.md | 22 - .../V1.2.x/Tools-System/Import-Export-Tool.md | 4 +- src/zh/UserGuide/latest/API/RestServiceV2.md | 2 +- .../Deployment-Guide_timecho.md| 2 +- .../latest/FAQ/Frequently-asked-questions.md | 19 + src/zh/UserGuide/latest/Reference/Keywords.md | 2 + src/zh/UserGuide/latest/SQL-Manual/SQL-Manual.md | 62 +++--- .../latest/Tools-System/Import-Export-Tool.md | 4 +- .../UserGuide/latest/User-Manual/AINode_timecho.md | 2 +- src/zh/UserGuide/latest/User-Manual/Query-Data.md | 6 +- 28 files changed, 261 insertions(+), 218 deletions(-) diff --git a/src/UserGuide/Master/API/RestServiceV2.md b/src/UserGuide/Master/API/RestServiceV2.md index 24fe76b..ea7e765 100644 --- a/src/UserGuide/Master/API/RestServiceV2.md +++ b/src/UserGuide/Master/API/RestServiceV2.md @@ -32,7 +32,7 @@ RESTful services are disabled by default. * User - Find the `conf/iotdb.rest.properties` file under the IoTDB installation directory and set `enable_rest_service` to `true` to enable the module. + Find the `conf/iotdb-datanode.properties` file under the IoTDB installation directory and set `enable_rest_service` to `true` to enable the module. ```properties enable_rest_service=true @@ -523,8 +523,7 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "expressions": null, "column_names": [ "devices", -"isAligned", -"Template" +"isAligned" ], "timestamps": null, "values": [ @@ -535,10 +534,6 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" -], -[ - "t1", - null ] ] } @@ -556,8 +551,7 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "column_names": [ "devices", "database", -"isAligned", -"Template" +"isAligned" ], "timestamps": null, "values": [ @@ -572,10 +566,6 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" -], -[ - "t1", - null ] ] } diff --git a/src/UserGuide/Master/Reference/Keywords.md b/src/UserGuide/Master/Reference/Keywords.md index 01449ff..c098b3e 100644 --- a/src/UserGuide/Master/Reference/Keywords.md +++ b/src/UserGuide/Master/Reference/Keywords.md @@ -107,6 +107,7 @@ Common Keywords: - GRANT_USER_PRIVILEGE - GRANT_USER_ROLE - GROUP +- HEAD - HAVING - INDEX - INFO @@ -192,6 +193,7 @@ Common Keywords: - STATEFUL - STOP - SYSTEM +- TAIL - TAGS - TASK - TEMPLATE diff --git a/src/UserGuide/Master/Tools-System/Import-Export-Tool.md b/src/UserGuide/Master/Tools-System/Import-Export-Tool.md index 2c81f85..ec133b2 100644 --- a/src/UserGuide/Master/Tools-System/Import-Export-Tool.md +++ b/src/UserGuide/Master/Tools-System/Import-Export-Tool.md @@ -160,7 +160,7 @@ In addition, if you do
(iotdb-docs) branch main updated: Corrected some of the content of the page (#173)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 3e6e5b5 Corrected some of the content of the page (#173)
3e6e5b5 is described below
commit 3e6e5b5bc47dea08959a1539e3fa8aaea32b9ea3
Author: Tanxilo <101696091+tanx...@users.noreply.github.com>
AuthorDate: Fri Feb 2 11:31:20 2024 +0800
Corrected some of the content of the page (#173)
---
.../Master/User-Manual/Database-Programming.md | 10
.../Master/User-Manual/Operate-Metadata.md | 4 +++-
.../{latest => Master}/User-Manual/Streaming.md| 28 +++---
.../latest/User-Manual/Database-Programming.md | 10
.../latest/User-Manual/Operate-Metadata.md | 4 +++-
src/zh/UserGuide/latest/User-Manual/Streaming.md | 28 +++---
6 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/src/zh/UserGuide/Master/User-Manual/Database-Programming.md
b/src/zh/UserGuide/Master/User-Manual/Database-Programming.md
index 775301b..c6d5020 100644
--- a/src/zh/UserGuide/Master/User-Manual/Database-Programming.md
+++ b/src/zh/UserGuide/Master/User-Manual/Database-Programming.md
@@ -1497,13 +1497,13 @@ SHOW FUNCTIONS
### 用户权限管理
-用户在使用 UDF 时会涉及到 3 种权限：
+用户在使用 UDF 时会涉及到 1 种权限：`USE_UDF`
-* `USE_UDF`：具备该权限的用户才被允许执行 UDF 注册操作
-* `DROP_FUNCTION`：具备该权限的用户才被允许执行 UDF 卸载操作
-* `READ_TIMESERIES`：具备该权限的用户才被允许使用 UDF 进行查询
+* 具备该权限的用户才被允许执行 UDF 注册操作
+* 具备该权限的用户才被允许执行 UDF 卸载操作
+* 具备该权限的用户才被允许使用 UDF 进行查询
-更多用户权限相关的内容，请参考 [权限管理语句](./Security-Management_timecho.md##权限管理)。
+更多用户权限相关的内容，请参考 [权限管理语句](./Authority-Management.md##权限管理)。
### 配置项
diff --git a/src/zh/UserGuide/Master/User-Manual/Operate-Metadata.md
b/src/zh/UserGuide/Master/User-Manual/Operate-Metadata.md
index 6444f46..2ff1c45 100644
--- a/src/zh/UserGuide/Master/User-Manual/Operate-Metadata.md
+++ b/src/zh/UserGuide/Master/User-Manual/Operate-Metadata.md
@@ -340,7 +340,7 @@ IoTDB> create device template t2 aligned (lat FLOAT
encoding=Gorilla, lon FLOAT
挂载元数据模板的 SQL 语句如下所示：
```shell
-IoTDB> set schema template t1 to root.sg1.d1
+IoTDB> set device template t1 to root.sg1.d1
```
### 激活设备模板
@@ -1078,6 +1078,8 @@ IoTDB> show devices root.ln.**
IoTDB> show devices root.ln.** where device contains 't'
IoTDB> show devices root.ln.** where template = 't1'
IoTDB> show devices root.ln.** where template is null
+IoTDB> show devices root.ln.** where template != 't1'
+IoTDB> show devices root.ln.** where template is not null
```
你可以获得如下数据：
diff --git a/src/zh/UserGuide/latest/User-Manual/Streaming.md
b/src/zh/UserGuide/Master/User-Manual/Streaming.md
similarity index 98%
copy from src/zh/UserGuide/latest/User-Manual/Streaming.md
copy to src/zh/UserGuide/Master/User-Manual/Streaming.md
index 0f25bac..bd23ab7 100644
--- a/src/zh/UserGuide/latest/User-Manual/Streaming.md
+++ b/src/zh/UserGuide/Master/User-Manual/Streaming.md
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -738,22 +738,22 @@ WHERE CONNECTOR USED BY
### 流处理任务
-| 权限名称| 描述 |
-| --- | -- |
-| CREATE_PIPE | 注册流处理任务。路径无关。 |
-| START_PIPE | 开启流处理任务。路径无关。 |
-| STOP_PIPE | 停止流处理任务。路径无关。 |
-| DROP_PIPE | 卸载流处理任务。路径无关。 |
-| SHOW_PIPES | 查询流处理任务。路径无关。 |
+| 权限名称 | 描述 |
+| | -- |
+| USE_PIPE | 注册流处理任务。路径无关。 |
+| USE_PIPE | 开启流处理任务。路径无关。 |
+| USE_PIPE | 停止流处理任务。路径无关。 |
+| USE_PIPE | 卸载流处理任务。路径无关。 |
+| USE_PIPE | 查询流处理任务。路径无关。 |
### 流处理任务插件
-| 权限名称 | 描述 |
-| - | -- |
-| CREATE_PIPEPLUGIN | 注册流处理任务插件。路径无关。 |
-| DROP_PIPEPLUGIN | 卸载流处理任务插件。路径无关。 |
-| SHOW_PIPEPLUGINS | 查询流处理任务插件。路径无关。 |
+| 权限名称 | 描述 |
+| :--- | -- |
+| USE_PIPE | 注册流处理任务插件。路径无关。 |
+| USE_PIPE | 卸载流处理任务插件。路径无关。 |
+| USE_PIPE | 查询流处理任务插件。路径无关。 |
## 配置参数
diff --git a/src/zh/UserGuide/latest/User-Manual/Database-Programming.md
b/src/zh/UserGuide/latest/User-Manual/Database-Programming.md
index 775301b..c6d5020 100644
--- a/src/zh/UserGuide/latest/User-Manual/Database-Programming.md
+++ b/src/zh/UserGuide/latest/User-Manual/Database-Programming.md
@@ -1497,13 +1497,13 @@ SHOW FUNCTIONS
### 用户权限管理
-用户在使用 UDF 时会涉及到 3 种权限：
+用户在使用 UDF 时会涉及到 1 种权限：`USE_UDF`
-* `USE_UDF`：具备该权限的用户才被
(iotdb-docs) branch main updated: fixing bad urls and the SQL Manual statement formatting (#167)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 979c7fa fixing bad urls and the SQL Manual statement formatting (#167)
979c7fa is described below
commit 979c7fa53c116596230e69422f5a55f7f24d3abf
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Wed Jan 31 13:23:10 2024 +0800
fixing bad urls and the SQL Manual statement formatting (#167)
---
src/.vuepress/sidebar/V1.2.x/zh.ts | 3 +-
src/.vuepress/sidebar/V1.3.x/en.ts | 1 -
src/.vuepress/sidebar/V1.3.x/zh.ts | 4 +-
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 1 -
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 3 +-
...al-Requirement.md => Deployment-Preparation.md} | 3 +
.../Master/Reference/Function-and-Expression.md| 345 +++
src/zh/UserGuide/Master/Reference/UDF-Libraries.md | 4 +-
src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 679 +++--
.../Master/User-Manual/IoTDB-View_timecho.md | 2 +-
.../Master/User-Manual/Operate-Metadata.md | 4 +-
.../Master/User-Manual/Operator-and-Expression.md | 13 +-
...al-Requirement.md => Deployment-Preparation.md} | 0
...al-Requirement.md => Deployment-Preparation.md} | 5 +
.../latest/Reference/Function-and-Expression.md| 345 +++
src/zh/UserGuide/latest/Reference/UDF-Libraries.md | 4 +-
src/zh/UserGuide/latest/SQL-Manual/SQL-Manual.md | 661 ++--
.../latest/User-Manual/IoTDB-View_timecho.md | 2 +-
.../latest/User-Manual/Operate-Metadata.md | 4 +-
.../latest/User-Manual/Operator-and-Expression.md | 13 +-
21 files changed, 1420 insertions(+), 678 deletions(-)
diff --git a/src/.vuepress/sidebar/V1.2.x/zh.ts
b/src/.vuepress/sidebar/V1.2.x/zh.ts
index 2bd84e8..a101713 100644
--- a/src/.vuepress/sidebar/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.2.x/zh.ts
@@ -66,9 +66,8 @@ export const zhSidebar = {
prefix: 'Deployment-and-Maintenance/',
// children: 'structure',
children: [
-{ text: '环境要求', link: 'Environmental-Requirement' },
+{ text: '部署准备', link: 'Deployment-Preparation' },
{ text: '资源推荐', link: 'Deployment-Recommendation' },
-{ text: '安装包获取', link: 'Get-Installation-Package' },
{ text: '部署指导', link: 'Deployment-Guide' },
{ text: 'docker部署', link: 'Docker-Install' },
],
diff --git a/src/.vuepress/sidebar/V1.3.x/en.ts
b/src/.vuepress/sidebar/V1.3.x/en.ts
index 1c4a41f..b68201a 100644
--- a/src/.vuepress/sidebar/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar/V1.3.x/en.ts
@@ -122,7 +122,6 @@ export const enSidebar = {
{ text: 'Kafka', link: 'Programming-Kafka' },
{ text: 'REST API V1 (Not Recommend)', link: 'RestServiceV1' },
{ text: 'REST API V2', link: 'RestServiceV2' },
-{ text: 'TsFile API', link: 'Programming-TsFile-API' },
],
},
{
diff --git a/src/.vuepress/sidebar/V1.3.x/zh.ts
b/src/.vuepress/sidebar/V1.3.x/zh.ts
index fdc7adf..57c071c 100644
--- a/src/.vuepress/sidebar/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.3.x/zh.ts
@@ -66,9 +66,8 @@ export const zhSidebar = {
prefix: 'Deployment-and-Maintenance/',
// children: 'structure',
children: [
-{ text: '环境要求', link: 'Environmental-Requirement' },
+{ text: '部署准备', link: 'Deployment-Preparation' },
{ text: '资源推荐', link: 'Deployment-Recommendation' },
-{ text: '安装包获取', link: 'Get-Installation-Package' },
{ text: '部署指导', link: 'Deployment-Guide' },
{ text: 'docker部署', link: 'Docker-Install' },
],
@@ -122,7 +121,6 @@ export const zhSidebar = {
{ text: 'Kafka', link: 'Programming-Kafka' },
{ text: 'REST API V1', link: 'RestServiceV1' },
{ text: 'REST API V2', link: 'RestServiceV2' },
-{ text: 'TsFile API', link: 'Programming-TsFile-API' },
],
},
{
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
index e2cd181..0d3d3e2 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
@@ -66,7 +66,7 @@ export const zhSidebar = {
prefix: 'Deployment-and-Maintenance/',
// children: 'structure',
children: [
-{ text: '环境要求', link: 'Environmental-Requirement' },
+{ text: '部署准备', link: 'Deployment-Preparation' },
{ text: '资源推荐', link: 'Deployment-Recommendation' },
{ text: '部署指导', link: 'Deployment-Guide_timecho' },
{ text: 'docker部署', link: 'Docker-Install' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.t
(iotdb-docs) branch main updated: Modify some bad links (#166)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new aef4413 Modify some bad links (#166) aef4413 is described below commit aef441365429fe96361c628050bfc9d63af82c67 Author: Tansgr <101696091+tanx...@users.noreply.github.com> AuthorDate: Tue Jan 30 09:38:21 2024 +0800 Modify some bad links (#166) --- .../Deployment-and-Maintenance/Deployment-Guide.md | 8 src/UserGuide/Master/User-Manual/Query-Data.md | 2 +- .../Deployment-and-Maintenance/Deployment-Guide.md | 8 src/UserGuide/latest/User-Manual/Query-Data.md | 2 +- .../Deployment-and-Maintenance/Deployment-Guide.md | 8 src/zh/UserGuide/Master/User-Manual/Query-Data.md| 16 .../Deployment-and-Maintenance/Deployment-Guide.md | 8 src/zh/UserGuide/latest/User-Manual/Query-Data.md| 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md index 2bd1849..5560179 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide.md @@ -107,7 +107,7 @@ the default number of replicas is one. ./cluster0/sbin/start-cli.sh ``` -+ Execute the [show cluster details](https://iotdb.apache.org/UserGuide/Master/Maintenance-Tools/Maintenance-Command.html#show-all-node-information) ++ Execute the `show cluster details` command on the Cli. The result is shown below: ``` @@ -338,7 +338,7 @@ and DataNode configuration (see Chap 5.2.3). Open the common configuration file ./conf/iotdb-common.properties, and set the following parameters base on the -[Deployment Recommendation](https://iotdb.apache.org/UserGuide/Master/Cluster/Deployment-Recommendation.html): +[Deployment Recommendation](./Deployment-Recommendation.md): | **Configuration** | **Description** | **Default** | | -- | | --- | @@ -413,7 +413,7 @@ Before start the Seed-ConfigNode, please open the common configuration file ./co | data\_replication\_factor | Is set to the expected data replication count | | data\_region\_consensus\_protocol\_class | Is set to the expected consensus protocol | -**Notice:** Please set these parameters carefully based on the [Deployment Recommendation](https://iotdb.apache.org/UserGuide/Master/Cluster/Deployment-Recommendation.html). +**Notice:** Please set these parameters carefully based on the [Deployment Recommendation](./Deployment-Recommendation.md). These parameters are not modifiable after the Node first startup. Then open its configuration file ./conf/iotdb-confignode.properties and check the following parameters: @@ -543,7 +543,7 @@ If the cluster is in local environment, you can directly run the Cli startup scr ``` If you want to use the Cli to connect to a cluster in the production environment, -Please read the [Cli manual](https://iotdb.apache.org/UserGuide/Master/QuickStart/Command-Line-Interface.html). +Please read the [Cli manual](../Tools-System/CLI.md). Verify Cluster diff --git a/src/UserGuide/Master/User-Manual/Query-Data.md b/src/UserGuide/Master/User-Manual/Query-Data.md index 61b863f..4d60a72 100644 --- a/src/UserGuide/Master/User-Manual/Query-Data.md +++ b/src/UserGuide/Master/User-Manual/Query-Data.md @@ -2880,7 +2880,7 @@ The user must have the following permissions to execute a query write-back state * All `READ_TIMESERIES` permissions for the source series in the `select` clause. * All `INSERT_TIMESERIES` permissions for the target series in the `into` clause. -For more user permissions related content, please refer to [Account Management Statements](../Administration-Management/Administration.md). +For more user permissions related content, please refer to [Account Management Statements](./Authority-Management.md). ### Configurable Properties diff --git a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md index 136c27c..3df2116 100644 --- a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md +++ b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md @@ -104,7 +104,7 @@ the default number of replicas is one. ./cluster0/sbin/start-cli.sh ``` -+ Execute the [show cluster details](https://iotdb.apache.org/UserGuide/Master/Maintenance
(iotdb-docs) branch main updated: Upload the pipe supplementary plug-in package to the cluster (#161)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 839b15e Upload the pipe supplementary plug-in package to the cluster (#161) 839b15e is described below commit 839b15e2573dce901d5a98bcb184857b2e0f0d9e Author: Tansgr <101696091+tanx...@users.noreply.github.com> AuthorDate: Thu Jan 25 15:30:52 2024 +0800 Upload the pipe supplementary plug-in package to the cluster (#161) --- .../Master/User-Manual/Streaming_timecho.md| 31 +- .../V1.2.x/User-Manual/Streaming_timecho.md| 419 +++-- .../latest/User-Manual/Streaming_timecho.md| 31 +- .../Master/User-Manual/Streaming_timecho.md| 32 +- .../V1.2.x/User-Manual/Streaming_timecho.md| 32 +- .../latest/User-Manual/Streaming_timecho.md| 32 +- 6 files changed, 344 insertions(+), 233 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/Streaming_timecho.md b/src/UserGuide/Master/User-Manual/Streaming_timecho.md index b4987e8..6c4a633 100644 --- a/src/UserGuide/Master/User-Manual/Streaming_timecho.md +++ b/src/UserGuide/Master/User-Manual/Streaming_timecho.md @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -455,15 +455,32 @@ AS USING ``` -For example, the user has implemented a data processing plugin with the full class name edu.tsinghua.iotdb.pipe.ExampleProcessor. -The packaged jar resource package is stored at https://example.com:8080/iotdb/pipe-plugin.jar. The user wants to use this plugin in the stream processing engine. -Mark the plugin as example. Then, the creation statement of this data processing plugin is as shown in the figure. +Example: If you implement a data processing plugin named edu.tsinghua.iotdb.pipe.ExampleProcessor, and the packaged jar package is pipe-plugin.jar, you want to use this plugin in the stream processing engine, and mark the plugin as example. There are two ways to use the plug-in package, one is to upload to the URI server, and the other is to upload to the local directory of the cluster. + +Method 1: Upload to the URI server + +Preparation: To register in this way, you need to upload the JAR package to the URI server in advance and ensure that the IoTDB instance that executes the registration statement can access the URI server. For example https://example.com:8080/iotdb/pipe-plugin.jar . + +SQL： + ```sql -CREATE PIPEPLUGIN example -AS 'edu.tsinghua.iotdb.pipe.ExampleProcessor' +SQL CREATE PIPEPLUGIN example +AS 'edu.tsinghua.iotdb.pipe.ExampleProcessor' USING URI '<https://example.com:8080/iotdb/pipe-plugin.jar>' ``` +Method 2: Upload the data to the local directory of the cluster + +Preparation: To register in this way, you need to place the JAR package in any path on the machine where the DataNode node is located, and we recommend that you place the JAR package in the /ext/pipe directory of the IoTDB installation path (the installation package is already in the installation package, so you do not need to create a new one). For example: iotdb-1.x.x-bin/ext/pipe/pipe-plugin.jar. **(Note: If you are using a cluster, you will need to place the JAR package under the sam [...] + +SQL： + +```sql +SQL CREATE PIPEPLUGIN example +AS 'edu.tsinghua.iotdb.pipe.ExampleProcessor' +USING URI '' +``` + ### Delete plugin statement When the user no longer wants to use a plugin and needs to uninstall the plugin from the system, he can use the delete plugin statement as shown in the figure. diff --git a/src/UserGuide/V1.2.x/User-Manual/Streaming_timecho.md b/src/UserGuide/V1.2.x/User-Manual/Streaming_timecho.md index 06748a4..6c4a633 100644 --- a/src/UserGuide/V1.2.x/User-Manual/Streaming_timecho.md +++ b/src/UserGuide/V1.2.x/User-Manual/Streaming_timecho.md @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,7 +19,7 @@ --> -# IoTDB Stream Processing Framework +# IoTDB stream processing framework The IoTDB stream processing framework allows
(iotdb-docs) branch main updated: remove SimpleConsensus description in Standalone Mode
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 33811b1 remove SimpleConsensus description in Standalone Mode 33811b1 is described below commit 33811b193b202313bf7dc980440745a2afa6829e Author: qiaojialin <646274...@qq.com> AuthorDate: Thu Jan 25 13:55:59 2024 +0800 remove SimpleConsensus description in Standalone Mode --- src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md| 3 --- .../latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md | 3 --- src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md | 2 -- .../latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md | 2 -- 4 files changed, 10 deletions(-) diff --git a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md index 2bd1849..136c27c 100644 --- a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md +++ b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md @@ -76,9 +76,6 @@ Users can start IoTDB standalone mode by the start-standalone script under the s > sbin\start-standalone.bat ``` -Note: Currently, To run standalone mode, you need to ensure that all addresses are set to 127.0.0.1, If you need to access the IoTDB from a machine different from the one where the IoTDB is located, please change the configuration item `dn_rpc_address` to the IP of the machine where the IoTDB lives. And replication factors set to 1, which is by now the default setting. -Besides, it's recommended to use SimpleConsensus in this mode, since it brings additional efficiency. - ## Cluster Deployment This article uses a local environment as an example to illustrate how to start, expand, and shrink an IoTDB Cluster. diff --git a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 73aac39..44d133b 100644 --- a/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -76,9 +76,6 @@ Users can start IoTDB standalone mode by the start-standalone script under the s > sbin\start-standalone.bat ``` -Note: Currently, To run standalone mode, you need to ensure that all addresses are set to 127.0.0.1, If you need to access the IoTDB from a machine different from the one where the IoTDB is located, please change the configuration item `dn_rpc_address` to the IP of the machine where the IoTDB lives. And replication factors set to 1, which is by now the default setting. -Besides, it's recommended to use SimpleConsensus in this mode, since it brings additional efficiency. - ## Cluster deployment(Cluster management tool) The IoTDB cluster management tool is an easy-to-use operation and maintenance tool (enterprise version tool). diff --git a/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md b/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md index 2346751..bd0c2f8 100644 --- a/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md +++ b/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide.md @@ -70,8 +70,6 @@ Windows 系统启动命令如下： > sbin\start-standalone.bat ``` -注意：目前，要使用单机模式，你需要保证所有的地址设置为 127.0.0.1，如果需要从非 IoTDB 所在的机器访问此IoTDB，请将配置项 `dn_rpc_address` 修改为 IoTDB 所在的机器 IP。副本数设置为1。并且，推荐使用 SimpleConsensus，因为这会带来额外的效率。这些现在都是默认配置。 - ## 集群版部署 以本地环境为例，演示 IoTDB 集群的启动、扩容与缩容。 diff --git a/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 7c3c50a..2dcc1aa 100644 --- a/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/zh/UserGuide/latest/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -70,8 +70,6 @@ Windows 系统启动命令如下： > sbin\start-standalone.bat ``` -注意：目前，要使用单机模式，你需要保证所有的地址设置为 127.0.0.1，如果需要从非 IoTDB 所在的机器访问此IoTDB，请将配置项 `dn_rpc_address` 修改为 IoTDB 所在的机器 IP。副本数设置为1。并且，推荐使用 SimpleConsensus，因为这会带来额外的效率。这些现在都是默认配置。 - ## 集群版部署（使用集群管理工具） IoTDB 集群管理工具是一款易用的运维工具（企业版工具）。旨在解决 IoTDB 分布式系统多节点的运维难题，主要包括集群部署、集群启停、弹性扩容、配置更新、数据导出等功能，从而实现对复杂数据库集群的一键式指令下发，
(iotdb-docs) branch main updated: fix the bad URLs of V1.3 (#159)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new b60da11 fix the bad URLs of V1.3 (#159)
b60da11 is described below
commit b60da11c4ec9adde12d608b50a1b114bc2199580
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Thu Jan 25 09:18:42 2024 +0800
fix the bad URLs of V1.3 (#159)
---
src/.vuepress/sidebar/V1.3.x/zh.ts | 1 +
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 1 +
.../Deployment-Guide_timecho.md| 22 ++--
.../Master/Reference/Function-and-Expression.md| 104 +--
src/zh/UserGuide/Master/Tools-System/Benchmark.md | 2 +-
.../Master/User-Manual/Database-Programming.md | 24 ++---
.../Master/User-Manual/IoTDB-Data-Pipe_timecho.md | 2 +-
.../Master/User-Manual/Operate-Metadata.md | 4 +-
.../Master/User-Manual/Operator-and-Expression.md | 113 ++---
.../stage/Edge-Cloud-Collaboration/Sync-Tool.md| 2 +-
.../Master/stage/Operate-Metadata/Timeseries.md| 2 +-
.../Deployment-Guide_timecho.md| 4 +-
.../latest/Reference/Function-and-Expression.md| 104 +--
src/zh/UserGuide/latest/Tools-System/Benchmark.md | 2 +-
src/zh/UserGuide/latest/User-Manual/Data-Sync.md | 2 +-
.../latest/User-Manual/Database-Programming.md | 22 ++--
.../latest/User-Manual/IoTDB-Data-Pipe_timecho.md | 2 +-
.../latest/User-Manual/Operate-Metadata.md | 91 +
.../latest/User-Manual/Operator-and-Expression.md | 113 ++---
.../Integration-Test-refactoring-tutorial.md | 4 +-
.../latest/stage/Operate-Metadata/Timeseries.md| 2 +-
21 files changed, 311 insertions(+), 312 deletions(-)
diff --git a/src/.vuepress/sidebar/V1.3.x/zh.ts
b/src/.vuepress/sidebar/V1.3.x/zh.ts
index 89667b3..fdc7adf 100644
--- a/src/.vuepress/sidebar/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.3.x/zh.ts
@@ -168,6 +168,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: 'UDF 函数库', link: 'UDF-Libraries' },
+{ text: '内置函数与表达式', link: 'Function-and-Expression' },
{ text: '配置参数', link: 'Common-Config-Manual' },
{ text: 'ConfigNode配置参数', link: 'ConfigNode-Config-Manual' },
{ text: 'DataNode配置参数', link: 'DataNode-Config-Manual' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
index f2b48d8..17add1d 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
@@ -173,6 +173,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: 'UDF 函数库', link: 'UDF-Libraries' },
+{ text: '内置函数与表达式', link: 'Function-and-Expression' },
{ text: '配置参数', link: 'Common-Config-Manual' },
{ text: 'ConfigNode配置参数', link: 'ConfigNode-Config-Manual' },
{ text: 'DataNode配置参数', link: 'DataNode-Config-Manual' },
diff --git
a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md
b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md
index 8c97029..7c3c50a 100644
---
a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md
+++
b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md
@@ -77,7 +77,7 @@ Windows 系统启动命令如下：
IoTDB 集群管理工具是一款易用的运维工具（企业版工具）。旨在解决 IoTDB
分布式系统多节点的运维难题，主要包括集群部署、集群启停、弹性扩容、配置更新、数据导出等功能，从而实现对复杂数据库集群的一键式指令下发，
极大降低管理难度。本文档将说明如何用集群管理工具远程部署、配置、启动和停止 IoTDB 集群实例。
-### Environmental preparation
+### 环境准备
本工具为 TimechoDB（基于IoTDB的企业版数据库）配套工具，您可以联系您的销售获取工具下载方式。
@@ -753,8 +753,8 @@ iotdbctl cluster activate default_cluster -N confignode1
-op license_path
下载二进制文件
1. 打开官网[Download Page](https://iotdb.apache.org/Download/)。
-2. 下载 IoTDB 1.0.0 版本的二进制文件。
-3. 解压得到 apache-iotdb-1.0.0-all-bin 目录。
+2. 下载 IoTDB 1.3.0 版本的二进制文件。
+3. 解压得到 apache-iotdb-1.3.0-all-bin 目录。
使用源码编译
@@ -764,14 +764,14 @@ iotdbctl cluster activate default_cluster -N confignode1
-op license_path
```
git clone https://github.com/apache/iotdb.git
-git checkout v1.0.0
+git checkout v1.3.0
```
**官网下载**
1. 打开官网[Download Page](https://iotdb.apache.org/Download/)。
2. 下载 IoTDB 1.0.0 版本的源码。
-3. 解压得到 apache-iotdb-1.0.0 目录。
+3. 解压得到 apache-iotdb-1.3.0 目录。
# 编译源码
@@ -782,12 +782,12 @@ mvn clean package -pl distribution -am -DskipTests
```
编译成功后，可在目录
-**distribution/target/apache-iotdb-1.0.0-SNAPSHOT-all-bin/apache-iotdb-1.0.0-SNAPSHOT-all-bin**
+**distribution/target/apache-iotdb-1.3.0-SNAPSHOT-all-bin/apache-iotdb-1.3.0-SNAPSHOT-all-bin**
找到集群版本的二进制文件。
### 安装包说明
-打开 apache-iotdb-1.0.0-SNAPSHOT-all-bin，可见以下目录：
+打开 apache-iotdb-1.3.0-SNAPSHOT-all-bin
(iotdb-docs) branch main updated (aa40877 -> 33c6a18)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git from aa40877 adjust the Engilish AINode doc in V1.3 and master (#158) add 33c6a18 add function doc into reference and fix its bad url (#157) No new revisions were added by this update. Summary of changes: .../Master/Reference/Function-and-Expression.md| 2653 .../latest/Reference/Function-and-Expression.md| 2653 2 files changed, 5306 insertions(+) create mode 100644 src/zh/UserGuide/Master/Reference/Function-and-Expression.md create mode 100644 src/zh/UserGuide/latest/Reference/Function-and-Expression.md
(iotdb-docs) branch main updated: adjust the Engilish AINode doc in V1.3 and master (#158)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new aa40877 adjust the Engilish AINode doc in V1.3 and master (#158)
aa40877 is described below
commit aa4086415ebb8534d82d285c51316f8938a8
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Wed Jan 24 11:51:27 2024 +0800
adjust the Engilish AINode doc in V1.3 and master (#158)
---
src/.vuepress/sidebar_timecho/V1.3.x/en.ts| 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts| 2 +-
.../Master/User-Manual/{IoTDB-AINode_timecho.md => AINode_timecho.md} | 4 ++--
.../latest/User-Manual/{IoTDB-AINode_timecho.md => AINode_timecho.md} | 4 ++--
.../Master/User-Manual/{IoTDB-AINode_timecho.md => AINode_timecho.md} | 0
.../latest/User-Manual/{IoTDB-AINode_timecho.md => AINode_timecho.md} | 0
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index f8b3d4c..1533169 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -89,7 +89,7 @@ export const enSidebar = {
{ text: 'Data Sync', link: 'Data-Sync_timecho' },
{ text: 'Tiered Storage', link: 'Tiered-Storage_timecho' },
{ text: 'View', link: 'IoTDB-View_timecho' },
-{ text: 'IoTDB AINode', link: 'IoTDB-AINode_timecho' },
+{ text: 'AINode', link: 'AINode_timecho' },
{ text: 'Database Programming', link: 'Database-Programming' },
{ text: 'Security Management', link: 'Security-Management_timecho' },
{ text: 'Authority Management', link: 'Authority-Management' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
index cbafae5..f2b48d8 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
@@ -89,7 +89,7 @@ export const zhSidebar = {
{ text: '数据同步', link: 'Data-Sync_timecho' },
{ text: '多级存储', link: 'Tiered-Storage_timecho' },
{ text: '视图', link: 'IoTDB-View_timecho' },
-{ text: 'AINode机器学习框架', link: 'IoTDB-AINode_timecho' },
+{ text: 'AINode', link: 'AINode_timecho' },
{ text: '数据库编程', link: 'Database-Programming' },
{ text: '安全控制', link: 'Security-Management_timecho' },
{ text: '权限管理', link: 'Authority-Management' },
diff --git a/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md
b/src/UserGuide/Master/User-Manual/AINode_timecho.md
similarity index 97%
rename from src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md
rename to src/UserGuide/Master/User-Manual/AINode_timecho.md
index cae9f95..c193bf6 100644
--- a/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md
+++ b/src/UserGuide/Master/User-Manual/AINode_timecho.md
@@ -19,9 +19,9 @@
-->
-# Endogenous Machine Learning Framework (AINode)
+# AINode（Machine Learning Framework）
-AINode is the third type of endogenous node provided by IoTDB after ConfigNode
and DataNode, which extends the capability of machine learning analysis of time
series by interacting with DataNode and ConfigNode of IoTDB cluster, supports
the introduction of pre-existing machine learning models from the outside to be
registered, and uses the registered models in the It supports the process of
introducing existing machine learning models from outside for registration, and
using the register [...]
+AINode is the third internal node after ConfigNode and DataNode in Apache
IoTDB, which extends the capability of machine learning analysis of time series
by interacting with DataNode and ConfigNode of IoTDB cluster, supports the
introduction of pre-existing machine learning models from the outside to be
registered, and uses the registered models in the It supports the process of
introducing existing machine learning models from outside for registration, and
using the registered models to [...]
The system architecture is shown below:
::: center
diff --git a/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md
b/src/UserGuide/latest/User-Manual/AINode_timecho.md
similarity index 97%
rename from src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md
rename to src/UserGuide/latest/User-Manual/AINode_timecho.md
index cae9f95..c193bf6 100644
--- a/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md
+++ b/src/UserGuide/latest/User-Manual/AINode_timecho.md
@@ -19,9 +19,9 @@
-->
-# Endogenous Machine Learning Framework (AINode)
+# AINode（Machine Learning Framework）
-AINode is the third type of endogenous node provided by IoTDB after ConfigNode
and DataNode, which extends the capability of machine learning analysis of time
series by interacting with
(iotdb-docs) branch main updated: add a description of database and a tiered-store parameter description (#153)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 0398b6b add a description of database and a tiered-store parameter description (#153) 0398b6b is described below commit 0398b6b69624964490ea8d5a0a1f0914fa0df09e Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Jan 18 15:32:33 2024 +0800 add a description of database and a tiered-store parameter description (#153) --- .../Basic-Concept/Data-Model-and-Terminology.md| 2 + .../Master/User-Manual/Operate-Metadata.md | 123 - src/UserGuide/Master/User-Manual/Syntax-Rule.md| 3 + .../Master/User-Manual/Tiered-Storage_timecho.md | 2 +- .../Basic-Concept/Data-Model-and-Terminology.md| 2 + .../latest/User-Manual/Operate-Metadata.md | 4 +- src/UserGuide/latest/User-Manual/Syntax-Rule.md| 3 + .../latest/User-Manual/Tiered-Storage_timecho.md | 2 +- .../Basic-Concept/Data-Model-and-Terminology.md| 2 +- .../Master/User-Manual/Operate-Metadata.md | 4 +- src/zh/UserGuide/Master/User-Manual/Syntax-Rule.md | 3 + .../Master/User-Manual/Tiered-Storage_timecho.md | 2 +- .../Basic-Concept/Data-Model-and-Terminology.md| 2 +- .../latest/User-Manual/Operate-Metadata.md | 33 +- src/zh/UserGuide/latest/User-Manual/Syntax-Rule.md | 3 + .../latest/User-Manual/Tiered-Storage_timecho.md | 2 +- 16 files changed, 108 insertions(+), 84 deletions(-) diff --git a/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md b/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md index 7057074..92549ac 100644 --- a/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/UserGuide/Master/Basic-Concept/Data-Model-and-Terminology.md @@ -43,6 +43,8 @@ It is information measured by detection equipment in an actual scene and can tra **A group of entities.** Users can create any prefix path as a database. Provided that there are four timeseries `root.ln.wf01.wt01.status`, `root.ln.wf01.wt01.temperature`, `root.ln.wf02.wt02.hardware`, `root.ln.wf02.wt02.status`, two devices `wt01`, `wt02` under the path `root.ln` may belong to the same owner or the same manufacturer, so d1 and d2 are closely related. At this point, the prefix path root.vehicle can be designated as a database, which will enable IoTDB to store all devic [...] +In general, it is recommended to create 1 database. + > Note1: A full path (`root.ln.wf01.wt01.status` as in the above example) is > not allowed to be set as a database. > > Note2: The prefix of a timeseries must belong to a database. Before creating > a timeseries, users must set which database the series belongs to. Only > timeseries whose database is set can be persisted to disk. diff --git a/src/UserGuide/Master/User-Manual/Operate-Metadata.md b/src/UserGuide/Master/User-Manual/Operate-Metadata.md index 2deeef1..4adb8e8 100644 --- a/src/UserGuide/Master/User-Manual/Operate-Metadata.md +++ b/src/UserGuide/Master/User-Manual/Operate-Metadata.md @@ -34,7 +34,9 @@ IoTDB > create database root.sgcc We can thus create two databases using the above two SQL statements. -It is worth noting that when the path itself or the parent/child layer of the path is already created as database, the path is then not allowed to be created as database. For example, it is not feasible to create `root.ln.wf01` as database when two databases `root.ln` and `root.sgcc` exist. The system gives the corresponding error prompt as shown below: +It is worth noting that 1 database is recommended. + +When the path itself or the parent/child layer of the path is already created as database, the path is then not allowed to be created as database. For example, it is not feasible to create `root.ln.wf01` as database when two databases `root.ln` and `root.sgcc` exist. The system gives the corresponding error prompt as shown below: ``` IoTDB> CREATE DATABASE root.ln.wf01 @@ -45,6 +47,8 @@ Msg: 300: root.ln has already been created as database. The LayerName of database can only be characters, numbers, underscores. If you want to set it to pure numbers or contain other characters, you need to enclose the database name with backticks (``). +Time series path supports the creation of hierarchical paths containing "*" for paths other than the database level, e.g. root.db.`*`. + Besides, if deploy on Windows system, the LayerName is case-insensitive, which means it's not allowed to create databases `root.ln` and `root.LN` at the same time. ### Show Databases @@ -317,7 +321,7 @@ Note: The `schema` keyword in the following statements can be omitted. ### Create Schema Template -The SQL syntax for creating a schema
(iotdb-docs) branch main updated: Fix the img of AInode doc by English (#152)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new b3de5f2 Fix the img of AInode doc by English (#152) b3de5f2 is described below commit b3de5f21ee4a9b5a9813ff6cb0ccea2c5568e161 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Jan 17 17:41:08 2024 +0800 Fix the img of AInode doc by English (#152) --- src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md | 4 ++-- src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md b/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md index a4847c9..cae9f95 100644 --- a/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md +++ b/src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md @@ -41,7 +41,7 @@ Compared with building a machine learning service alone, it has the following ad - **Avoid Data Migration**: With IoTDB native machine learning, data stored in IoTDB can be directly applied to the inference of machine learning models without having to move the data to a separate machine learning service platform, which accelerates data processing, improves security, and reduces costs. - + - **Built-in Advanced Algorithms**: supports industry-leading machine learning analytics algorithms covering typical timing analysis tasks, empowering the timing database with native data analysis capabilities. Such as: - **Time Series Forecasting**: learns patterns of change from past time series; thus outputs the most likely prediction of future series based on observations at a given past time. @@ -58,7 +58,7 @@ Compared with building a machine learning service alone, it has the following ad - **Built-in capabilities**: AINode comes with machine learning algorithms or home-grown models for common timing analysis scenarios (e.g., prediction and anomaly detection). ::: center -https://alioss.timecho.com/docs/img/h3.PNG; style="zoom:50%" /> +https://alioss.timecho.com/upload/AInode2.png; style="zoom:50%" /> ## 3. Installation and Deployment diff --git a/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md b/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md index a4847c9..cae9f95 100644 --- a/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md +++ b/src/UserGuide/latest/User-Manual/IoTDB-AINode_timecho.md @@ -41,7 +41,7 @@ Compared with building a machine learning service alone, it has the following ad - **Avoid Data Migration**: With IoTDB native machine learning, data stored in IoTDB can be directly applied to the inference of machine learning models without having to move the data to a separate machine learning service platform, which accelerates data processing, improves security, and reduces costs. - + - **Built-in Advanced Algorithms**: supports industry-leading machine learning analytics algorithms covering typical timing analysis tasks, empowering the timing database with native data analysis capabilities. Such as: - **Time Series Forecasting**: learns patterns of change from past time series; thus outputs the most likely prediction of future series based on observations at a given past time. @@ -58,7 +58,7 @@ Compared with building a machine learning service alone, it has the following ad - **Built-in capabilities**: AINode comes with machine learning algorithms or home-grown models for common timing analysis scenarios (e.g., prediction and anomaly detection). ::: center -https://alioss.timecho.com/docs/img/h3.PNG; style="zoom:50%" /> +https://alioss.timecho.com/upload/AInode2.png; style="zoom:50%" /> ## 3. Installation and Deployment
(iotdb-docs) branch main updated: Add and Fix the content about showDevice_Template (#134)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 8f1423e Add and Fix the content about showDevice_Template (#134) 8f1423e is described below commit 8f1423e8490d810882c2c8d9110e602426566d40 Author: linxt20 AuthorDate: Wed Jan 17 14:38:58 2024 +0800 Add and Fix the content about showDevice_Template (#134) --- src/UserGuide/Master/API/RestServiceV1.md | 14 ++- src/UserGuide/Master/API/RestServiceV2.md | 14 ++- src/UserGuide/Master/SQL-Manual/SQL-Manual.md | 4 + .../Master/User-Manual/Operate-Metadata.md | 115 .../Master/stage/Operate-Metadata/Node.md | 103 +++--- .../Master/stage/Operate-Metadata/Template.md | 12 +-- src/zh/UserGuide/Master/API/RestServiceV1.md | 14 ++- src/zh/UserGuide/Master/API/RestServiceV2.md | 14 ++- src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 18 .../Master/User-Manual/Operate-Metadata.md | 116 + .../Master/stage/Operate-Metadata/Node.md | 104 +++--- .../Master/stage/Operate-Metadata/Template.md | 12 +-- 12 files changed, 360 insertions(+), 180 deletions(-) diff --git a/src/UserGuide/Master/API/RestServiceV1.md b/src/UserGuide/Master/API/RestServiceV1.md index 2048c3c..34af056 100644 --- a/src/UserGuide/Master/API/RestServiceV1.md +++ b/src/UserGuide/Master/API/RestServiceV1.md @@ -523,7 +523,8 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "expressions": null, "columnNames": [ "devices", -"isAligned" +"isAligned", +"Template" ], "timestamps": null, "values": [ @@ -534,6 +535,10 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" +], +[ + "t1", + null ] ] } @@ -551,7 +556,8 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "columnNames": [ "devices", "database", -"isAligned" +"isAligned", +"Template" ], "timestamps": null, "values": [ @@ -566,6 +572,10 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" +], +[ + "t1", + null ] ] } diff --git a/src/UserGuide/Master/API/RestServiceV2.md b/src/UserGuide/Master/API/RestServiceV2.md index 900dfe5..24fe76b 100644 --- a/src/UserGuide/Master/API/RestServiceV2.md +++ b/src/UserGuide/Master/API/RestServiceV2.md @@ -523,7 +523,8 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "expressions": null, "column_names": [ "devices", -"isAligned" +"isAligned", +"Template" ], "timestamps": null, "values": [ @@ -534,6 +535,10 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" +], +[ + "t1", + null ] ] } @@ -551,7 +556,8 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X "column_names": [ "devices", "database", -"isAligned" +"isAligned", +"Template" ], "timestamps": null, "values": [ @@ -566,6 +572,10 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X [ "false", "false" +], +[ + "t1", + null ] ] } diff --git a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md index 9e1fc2f..4439e23 100644 --- a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md +++ b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md @@ -160,6 +160,10 @@ IoTDB> show schema templates IoTDB> show nodes in schema template t1 IoTDB> show paths set schema template t1 IoTDB> show paths using schema template t1 +IoTDB> show devices where template = 't1' +IoTDB> show devices where template != 't1' +IoTDB> show devices where template is null +IoTDB> show devices where template is not null ``` ### Deactivate Schema Template diff --git a/src/UserGuide/Master/User-Manual/Operate-Metadata.md b/src/UserG
(iotdb-docs) branch main updated: V1.2 fix bug of load TsFile (#129)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new b843617 V1.2 fix bug of load TsFile (#129) b843617 is described below commit b843617968f86e1b92b785fbc6a9559bf0227406 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Jan 17 14:23:00 2024 +0800 V1.2 fix bug of load TsFile (#129) --- src/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md| 2 +- src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md b/src/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md index 2c81f85..627619f 100644 --- a/src/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md +++ b/src/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md @@ -97,7 +97,7 @@ Run rewrite-tsfile.bat if you are in a Windows environment, or rewrite-tsfile.sh # Example -Assuming that an IoTDB instance is running on server 192.168.0.101:6667, you want to load all TsFile files from the locally saved TsFile backup folder D:\IoTDB\data into this IoTDB instance. +Assuming that an IoTDB instance is running on server 192.168.0.101:6667, You want to load all TsFile files into this IoTDB instance from the path of the server where the Iotdb process is located. First move to the folder `$IOTDB_HOME/tools/`, open the command line, and execute diff --git a/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md b/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md index c018e0a..6bbb7d2 100644 --- a/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md +++ b/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md @@ -95,7 +95,7 @@ ONSUCCESS选项表示对于成功载入的tsfile的处置方式，默认为delet 使用范例 -假定服务器192.168.0.101:6667上运行一个IoTDB实例，想从将本地保存的TsFile备份文件夹D:\IoTDB\data中的所有的TsFile文件都加载进此IoTDB实例。 +假定服务器192.168.0.101:6667上运行一个IoTDB实例，想从Iotdb进程所在服务器的路径将所有TsFile文件都加载进此IoTDB实例。 首先移动至`$IOTDB_HOME/tools/`，打开命令行，然后执行
(iotdb-docs) branch main updated: fix-content (#147)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 1f1fcb2 fix-content (#147) 1f1fcb2 is described below commit 1f1fcb219f02c9a5e62aa604e73e75f971824d23 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Jan 17 13:39:46 2024 +0800 fix-content (#147) --- src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 324 + .../Master/User-Manual/IoTDB-View_timecho.md | 4 +- src/zh/UserGuide/V1.3.x/SQL-Manual/SQL-Manual.md | 324 + .../V1.3.x/User-Manual/IoTDB-View_timecho.md | 4 +- 4 files changed, 148 insertions(+), 508 deletions(-) diff --git a/src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md b/src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md index 8531b72..83ebfe1 100644 --- a/src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md +++ b/src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md @@ -1802,312 +1802,132 @@ SHOW FUNCTIONS ## 权限管理 -### 1、创建用户 +### 用户与角色相关 -CREATE USER `ln_write_user` 'write_pwd' +- 创建用户（需 MANAGE_USER 权限) -CREATE USER `sgcc_write_user` 'write_pwd' -### 2、展示用户 - -LIST USER - -### 3、赋予用户权限 - -INSERT INTO root.ln.wf01.wt01(timestamp,status) values(150946560,true) - -系统不允许用户进行此操作，会提示错误： - -IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) values(150946560,true) - -Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES. - -用root用户分别赋予他们向对应 database 数据的写入权限 - -GRANT USER `ln_write_user` PRIVILEGES INSERT_TIMESERIES on root.ln.** - -GRANT USER `sgcc_write_user` PRIVILEGES INSERT_TIMESERIES on root.sgcc1.**, root.sgcc2.** - -GRANT USER `ln_write_user` PRIVILEGES CREATE_USER - -使用ln_write_user再尝试写入数据 - -IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp, status) values(150946560, true) - -Msg: The statement is executed successfully. - -### 4、撤销用户权限 - -用root用户撤销ln_write_user和sgcc_write_user的权限： - -REVOKE USER `ln_write_user` PRIVILEGES INSERT_TIMESERIES on root.ln.** - -REVOKE USER `sgcc_write_user` PRIVILEGES INSERT_TIMESERIES on root.sgcc1.**, root.sgcc2.** - -REVOKE USER `ln_write_user` PRIVILEGES CREATE_USER - -撤销权限后，ln_write_user就没有向root.ln.**写入数据的权限了 - -INSERT INTO root.ln.wf01.wt01(timestamp, status) values(150946560, true) - -Msg: 602: No permissions for this operation, please add privilege INSERT_TIMESERIES. - -### 5、SQL 语句 - -- 创建用户 - -```Go -CREATE USER ; +```SQL +CREATE USER +eg: CREATE USER user1 'passwd' ``` -Eg: IoTDB > CREATE USER `thulab` 'passwd'; +- 删除用户 (需 MANEGE_USER 权限) -- 删除用户 -```Go -DROP USER ; +```SQL +DROP USER +eg: DROP USER user1 ``` -Eg: IoTDB > DROP USER `xiaoming`; +- 创建角色 (需 MANAGE_ROLE 权限) -- 创建角色 - -```Go -CREATE ROLE ; +```SQL +CREATE ROLE +eg: CREATE ROLE role1 ``` -Eg: IoTDB > CREATE ROLE `admin`; +- 删除角色 (需 MANAGE_ROLE 权限) -- 删除角色 -```Go -DROP USER ; +```SQL +DROP ROLE +eg: DROP ROLE role1 ``` -Eg: IoTDB > DROP USER `xiaoming`; +- 赋予用户角色 (需 MANAGE_ROLE 权限) -- 赋予用户权限 -```Go -GRANT USER PRIVILEGES ON ; +```SQL +GRANT ROLE TO +eg: GRANT ROLE admin TO user1 ``` -Eg: IoTDB > GRANT USER `tempuser` PRIVILEGES INSERT_TIMESERIES, DELETE_TIMESERIES on root.ln.**, root.sgcc.**; +- 移除用户角色 (需 MANAGE_ROLE 权限) -Eg: IoTDB > GRANT USER `tempuser` PRIVILEGES CREATE_ROLE; -- 赋予用户全部的权限 - -```Go -GRANT USER PRIVILEGES ALL; +```SQL +REVOKE ROLE FROM +eg: REVOKE ROLE admin FROM user1 ``` -Eg: IoTDB > GRANT USER `tempuser` PRIVILEGES ALL; - -- 赋予角色权限 - -```Go -GRANT ROLE PRIVILEGES ON ; -``` - -Eg: IoTDB > GRANT ROLE `temprole` PRIVILEGES INSERT_TIMESERIES, DELETE_TIMESERIES ON root.sgcc.**, root.ln.**; - -Eg: IoTDB > GRANT ROLE `temprole` PRIVILEGES CREATE_ROLE; - -- 赋予角色全部的权限 - -```Go -GRANT ROLE PRIVILEGES ALL; -``` - -Eg: IoTDB > GRANT ROLE `temprole` PRIVILEGES ALL; - -- 赋予用户角色 - -```Go -GRANT TO ; -``` - -Eg: IoTDB > GRANT `temprole` TO tempuser; - -- 撤销用户权限 - -```Go -REVOKE USER PRIVILEGES ON ; -``` - -Eg: IoTDB > REVOKE USER `tempuser` PRIVILEGES DELETE_TIMESERIES on root.ln.**; - -Eg: IoTDB > REVOKE USER `tempuser` PRIVILEGES CREATE_ROLE; - -- 移除用户所有权限 - -```Go -REVOKE USER PRIVILEGES ALL; -``` - -Eg: IoTDB > REVOKE USER `tempuser` PRIVILEGES ALL; - -- 撤销角色权限 - -```Go -REVOKE ROLE PRIVILEGES ON ; -``` - -Eg: IoTDB > REVOKE ROLE `temprole` PRIVILEGES DELETE_TIMESERIES ON root.ln.**; - -Eg: IoTDB > REVOKE ROLE `temprole` PRIVILEGES CREATE_ROLE; - -- 撤销角色全部的权限 - -```Go -REVOKE ROLE PRIVILEGES ALL; -``` - -Eg: IoTDB > REVOKE ROLE `temprole` PRIVILEGES ALL; - -- 撤销用户角色 - -```Go -REVOKE FROM ; -``` - -Eg: IoTDB > REVOKE `temprole` FROM tempuser; - -- 列出所有用户 +- 列出所有用户 (需 MANEGE_USER 权限) +```SQL LIST USER - -Eg: IoTDB > LIST USER - -- 列出指定角色下所有用户 - -```Go -LIST USER OF
(iotdb-docs) branch main updated: Fix the img in AInode doc by English version (#149)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 450b25d Fix the img in AInode doc by English version (#149) 450b25d is described below commit 450b25dc43ed439ec89f649027051da0d12058e9 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Wed Jan 17 09:32:18 2024 +0800 Fix the img in AInode doc by English version (#149) --- src/UserGuide/Master/User-Manual/Data-Sync_timecho.md | 10 +- src/UserGuide/Master/User-Manual/Database-Programming.md| 2 +- src/UserGuide/Master/User-Manual/IoTDB-AINode_timecho.md| 2 +- src/UserGuide/Master/User-Manual/Streaming.md | 3 ++- src/UserGuide/Master/User-Manual/Streaming_timecho.md | 2 +- src/UserGuide/V1.2.x/User-Manual/Data-Sync.md | 2 +- src/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md | 2 +- src/UserGuide/V1.3.x/User-Manual/Data-Sync_timecho.md | 10 +- src/UserGuide/V1.3.x/User-Manual/Database-Programming.md| 2 +- src/UserGuide/V1.3.x/User-Manual/IoTDB-AINode_timecho.md| 2 +- src/UserGuide/V1.3.x/User-Manual/Streaming.md | 3 ++- src/UserGuide/V1.3.x/User-Manual/Streaming_timecho.md | 2 +- src/zh/UserGuide/Master/User-Manual/Database-Programming.md | 2 +- src/zh/UserGuide/V1.3.x/User-Manual/Database-Programming.md | 2 +- 14 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md b/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md index 5227555..1efe0e6 100644 --- a/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md +++ b/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md @@ -162,7 +162,7 @@ IoTDB> show pipeplugins This example is used to demonstrate the synchronisation of all data from one IoTDB to another IoTDB with the data link as shown below: - + In this example, we can create a synchronisation task named A2B to synchronise the full amount of data from IoTDB A to IoTDB B. Here we need to use the iotdb-thrift-sink plugin (built-in plugin) which uses sink, and we need to specify the address of the receiving end, in this example, we have specified 'sink.ip' and 'sink.port', and we can also specify 'sink.port'. This example specifies 'sink.ip' and 'sink.port', and also 'sink.node-urls', as in the following example statement: @@ -180,7 +180,7 @@ with sink ( This example is used to demonstrate the synchronisation of data from a certain historical time range (8:00pm 23 August 2023 to 8:00pm 23 October 2023) to another IoTDB, the data link is shown below: - + In this example we can create a synchronisation task called A2B. First of all, we need to define the range of data to be transferred in source, since the data to be transferred is historical data (historical data refers to the data that existed before the creation of the synchronisation task), we need to configure the source.realtime.enable parameter to false; at the same time, we need to configure the start-time and end-time of the data and the mode mode of the transfer. At the same tim [...] @@ -205,7 +205,7 @@ with SINK ( This example is used to demonstrate a scenario where two IoTDBs are dual-active with each other, with the data link shown below: - + In this example, in order to avoid an infinite loop of data, the parameter `'source.forwarding-pipe-requests` needs to be set to ``false`` on both A and B to indicate that the data transferred from the other pipe will not be forwarded. Also set `'source.history.enable'` to `false` to indicate that historical data is not transferred, i.e., data prior to the creation of the task is not synchronised. @@ -245,7 +245,7 @@ with sink ( This example is used to demonstrate a cascading data transfer scenario between multiple IoTDBs, where data is synchronised from cluster A to cluster B and then to cluster C. The data link is shown in the figure below: - + In this example, in order to synchronise the data from cluster A to C, the pipe between BC needs to be configured with `source.forwarding-pipe-requests` to `true`, the detailed statement is as follows: @@ -277,7 +277,7 @@ with sink ( This example is used to demonstrate a scenario where data from one IoTDB is synchronised to another IoTDB via a unidirectional gate, with the data link shown below: - branch main updated: Add AInode sidebar and modify streaming content of English documents (#148)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new bc4a10f Add AInode sidebar and modify streaming content of English
documents (#148)
bc4a10f is described below
commit bc4a10f9e005b0c8f2a93d57b9cee10c9000ed59
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Mon Jan 15 22:56:41 2024 +0800
Add AInode sidebar and modify streaming content of English documents (#148)
---
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 1 +
src/UserGuide/Master/User-Manual/Data-Sync_timecho.md| 10 +-
.../{V1.2.x => Master}/User-Manual/Streaming.md | 2 +-
src/UserGuide/Master/User-Manual/Streaming_timecho.md| 16 +++-
src/UserGuide/V1.2.x/User-Manual/Data-Sync.md| 2 +-
src/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md| 2 +-
src/UserGuide/V1.2.x/User-Manual/Streaming.md| 2 +-
src/UserGuide/V1.2.x/User-Manual/Streaming_timecho.md| 3 ++-
src/UserGuide/V1.3.x/User-Manual/Data-Sync_timecho.md| 10 +-
src/UserGuide/V1.3.x/User-Manual/Streaming.md| 2 +-
src/UserGuide/V1.3.x/User-Manual/Streaming_timecho.md| 16 +++-
11 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index 57f045c..a1e9d5a 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -89,6 +89,7 @@ export const enSidebar = {
{ text: 'Data Sync', link: 'Data-Sync_timecho' },
{ text: 'Tiered Storage', link: 'Tiered-Storage_timecho' },
{ text: 'View', link: 'IoTDB-View_timecho' },
+{ text: 'IoTDB AINode', link: 'IoTDB-AINode_timecho' },
{ text: 'Database Programming', link: 'Database-Programming' },
{ text: 'Security Management', link: 'Security-Management_timecho' },
{ text: 'Authority Management', link: 'Authority-Management' },
diff --git a/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md
b/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md
index c53b376..5227555 100644
--- a/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md
+++ b/src/UserGuide/Master/User-Manual/Data-Sync_timecho.md
@@ -162,7 +162,7 @@ IoTDB> show pipeplugins
This example is used to demonstrate the synchronisation of all data from one
IoTDB to another IoTDB with the data link as shown below:
-
+
In this example, we can create a synchronisation task named A2B to synchronise
the full amount of data from IoTDB A to IoTDB B. Here we need to use the
iotdb-thrift-sink plugin (built-in plugin) which uses sink, and we need to
specify the address of the receiving end, in this example, we have specified
'sink.ip' and 'sink.port', and we can also specify 'sink.port'. This example
specifies 'sink.ip' and 'sink.port', and also 'sink.node-urls', as in the
following example statement:
@@ -180,7 +180,7 @@ with sink (
This example is used to demonstrate the synchronisation of data from a certain
historical time range (8:00pm 23 August 2023 to 8:00pm 23 October 2023) to
another IoTDB, the data link is shown below:
-
+
In this example we can create a synchronisation task called A2B. First of all,
we need to define the range of data to be transferred in source, since the data
to be transferred is historical data (historical data refers to the data that
existed before the creation of the synchronisation task), we need to configure
the source.realtime.enable parameter to false; at the same time, we need to
configure the start-time and end-time of the data and the mode mode of the
transfer. At the same tim [...]
@@ -205,7 +205,7 @@ with SINK (
This example is used to demonstrate a scenario where two IoTDBs are
dual-active with each other, with the data link shown below:
-
+
In this example, in order to avoid an infinite loop of data, the parameter
`'source.forwarding-pipe-requests` needs to be set to ``false`` on both A and B
to indicate that the data transferred from the other pipe will not be
forwarded. Also set `'source.history.enable'` to `false` to indicate that
historical data is not transferred, i.e., data prior to the creation of the
task is not synchronised.
@@ -245,7 +245,7 @@ with sink (
This example is used to demonstrate a cascading data transfer scenario between
multiple IoTDBs, where data is synchronised from cluster A to cluster B and
then to cluster C. The data l
(iotdb-docs) branch main updated: Added workbench documentation for V1.2 and V1.3 (#145)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new c0a7fd2 Added workbench documentation for V1.2 and V1.3 (#145)
c0a7fd2 is described below
commit c0a7fd2f2181985fe019c0253dbf395c9b93b1da
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Fri Jan 12 11:33:49 2024 +0800
Added workbench documentation for V1.2 and V1.3 (#145)
---
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 2 +-
src/UserGuide/Master/Tools-System/Workbench.md | 357 -
.../Master/Tools-System/Workbench_timecho.md | 59
src/UserGuide/V1.2.x/Tools-System/Workbench.md | 357 -
.../V1.2.x/Tools-System/Workbench_timecho.md | 59
src/UserGuide/V1.3.x/Tools-System/Workbench.md | 357 -
.../V1.3.x/Tools-System/Workbench_timecho.md | 59
8 files changed, 179 insertions(+), 1073 deletions(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
index 8cf9052..e2cd181 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
@@ -101,7 +101,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: '命令行工具', link: 'CLI' },
-// { text: '控制台工具', link: 'Workbench' },
+{ text: '可视化控制台', link: 'Workbench_timecho' },
{ text: '监控工具', link: 'Monitor-Tool' },
{ text: '测试工具', link: 'Benchmark' },
{ text: '运维工具', link: 'Maintenance-Tool_timecho' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
index 709e934..f8cb4ec 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
@@ -102,7 +102,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: '命令行工具', link: 'CLI' },
-//{ text: '控制台工具', link: 'Workbench' },
+{ text: '可视化控制台', link: 'Workbench_timecho' },
{ text: '监控工具', link: 'Monitor-Tool' },
{ text: '测试工具', link: 'Benchmark' },
{ text: '运维工具', link: 'Maintenance-Tool_timecho' },
diff --git a/src/UserGuide/Master/Tools-System/Workbench.md
b/src/UserGuide/Master/Tools-System/Workbench.md
deleted file mode 100644
index ba9c20d..000
--- a/src/UserGuide/Master/Tools-System/Workbench.md
+++ /dev/null
@@ -1,357 +0,0 @@
-
-
-# Workbench
-
-Workbench is a graphical database management tool that can create multiple
connections. It is used to manage IoTDB, and provides functions such as
metadata visualization and management, data addition, deletion, modification,
and permission control. Workbench not only meets all the needs of professional
developers, but the simple and friendly interface design is also easy for
beginners to use.
-
-## Installation
-
-If you encounter any problems during the installation process, you can refer
to the documentation or seek help from the software vendor or technical support
team.
-
-Environmental requirements: JDK1.8.0_162 and above.
-
-1. Download and unzip the software. The first step is to download the software
from the official website or a trusted source at
https://www.timecho.com/product.
-2. Start the backend service. Enter the command:
-```
-java -jar workbench.jar
-```
-or
-```
-nohup java -jar workbench.jar >/dev/null 2>&1 &
-```
-The default port is 9090.
-
-3. Access the web interface. The default address is `IP:9090`.
-
-## Log In
-
-The default user name is root and the password is 123456. The user name must
be composed of letters, numbers, and underscores, and cannot start with numbers
and underscores. It must be greater than or equal to 4 characters, and the
password must be greater than or equal to 6 characters. Click "**文A**" to
switch languages, Chinese and English are available.
-
-
-
-## User Interface
-
-**Main interface**
-
-The main interface consists of an action bar, a navigation bar, a toolbar, and
several panes.
-
-
-
-### 1. Connection Operation Bar
-
-You can create a new database connection or database query.
-
-### 2. Object Pane
-
-The object pane displays the connected database instances. It adopts a tree
structure design. Clicking to display sub-nodes can facilitate the processing
of databases and their managed objects. The lowest level displayed is the
device.
-
-
-
-### 3. Navigation Bar
-
-In the
(iotdb-docs) branch main updated: Adjust directory (#144)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 461f531 Adjust directory (#144)
461f531 is described below
commit 461f531eba48ebb8ddb6aa977ef74ff0e5d96852
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Wed Jan 10 15:25:53 2024 +0800
Adjust directory (#144)
---
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.3.x/zh.ts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
index 6a38e2d..115d5c4 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
@@ -142,7 +142,7 @@ export const enSidebar = {
{ text: 'Spark IoTDB Connector', link: 'Spark-IoTDB' },
{ text: 'Hive TsFile Connector', link: 'Hive-TsFile' },
{ text: 'Flink IoTDB Connector', link: 'Flink-IoTDB' },
-{ text: 'Flink SQL IoTDB Connector', link: 'Flink-SQL-IoTDB' },
+//{ text: 'Flink SQL IoTDB Connector', link: 'Flink-SQL-IoTDB' },
{ text: 'Flink TsFile Connector', link: 'Flink-TsFile' },
{ text: 'NiFi IoTDB Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB', link: 'DBeaver' },
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
index 8eef8f0..8cf9052 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
@@ -142,7 +142,7 @@ export const zhSidebar = {
{ text: 'Spark-IoTDB-Connector', link: 'Spark-IoTDB' },
{ text: 'Hive-TsFile-Connector', link: 'Hive-TsFile' },
{ text: 'Flink-IoTDB-Connector', link: 'Flink-IoTDB' },
-{ text: 'Flink-SQL-IoTDB-Connector', link: 'Flink-SQL-IoTDB' },
+//{ text: 'Flink-SQL-IoTDB-Connector', link: 'Flink-SQL-IoTDB' },
{ text: 'Flink-TsFile-Connector', link: 'Flink-TsFile' },
{ text: 'NiFi-IoTDB-Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB 集成方案', link: 'DBeaver' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
index 818febc..57f045c 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/en.ts
@@ -142,7 +142,7 @@ export const enSidebar = {
{ text: 'Spark IoTDB Connector', link: 'Spark-IoTDB' },
{ text: 'Hive TsFile Connector', link: 'Hive-TsFile' },
{ text: 'Flink IoTDB Connector', link: 'Flink-IoTDB' },
-{ text: 'Flink SQL IoTDB Connector', link: 'Flink-SQL-IoTDB' },
+//{ text: 'Flink SQL IoTDB Connector', link: 'Flink-SQL-IoTDB' },
{ text: 'Flink TsFile Connector', link: 'Flink-TsFile' },
{ text: 'NiFi IoTDB Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB', link: 'DBeaver' },
diff --git a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
index 3e04982..709e934 100644
--- a/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.3.x/zh.ts
@@ -143,7 +143,7 @@ export const zhSidebar = {
{ text: 'Spark-IoTDB-Connector', link: 'Spark-IoTDB' },
{ text: 'Hive-TsFile-Connector', link: 'Hive-TsFile' },
{ text: 'Flink-IoTDB-Connector', link: 'Flink-IoTDB' },
-{ text: 'Flink-SQL-IoTDB-Connector', link: 'Flink-SQL-IoTDB' },
+//{ text: 'Flink-SQL-IoTDB-Connector', link: 'Flink-SQL-IoTDB' },
{ text: 'Flink-TsFile-Connector', link: 'Flink-TsFile' },
{ text: 'NiFi-IoTDB-Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB 集成方案', link: 'DBeaver' },
(iotdb-docs) branch main updated: deploy-doc (#142)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new f84150a deploy-doc (#142) f84150a is described below commit f84150a983f320c5e7f7c9f18028c7fc3c46c8f8 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Fri Jan 5 19:32:33 2024 +0800 deploy-doc (#142) --- .../Deployment-Guide_timecho.md| 18 +- .../UserGuide/V1.3.x/QuickStart/ClusterQuickStart.md | 16 +--- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 8d197da..3e0de9f 100644 --- a/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -77,7 +77,7 @@ Windows 系统启动命令如下： IoTDB 集群管理工具是一款易用的运维工具（企业版工具）。旨在解决 IoTDB 分布式系统多节点的运维难题，主要包括集群部署、集群启停、弹性扩容、配置更新、数据导出等功能，从而实现对复杂数据库集群的一键式指令下发， 极大降低管理难度。本文档将说明如何用集群管理工具远程部署、配置、启动和停止 IoTDB 集群实例。 -### Environmental preparation +### 环境准备 本工具为 IoTDB 企业版配套工具，您可以联系您的销售获取工具下载方式。 @@ -753,8 +753,8 @@ iotdbctl cluster activate default_cluster -N confignode1 -op license_path 下载二进制文件 1. 打开官网[Download Page](https://iotdb.apache.org/Download/)。 -2. 下载 IoTDB 1.0.0 版本的二进制文件。 -3. 解压得到 apache-iotdb-1.0.0-all-bin 目录。 +2. 下载 IoTDB 1.3.0 版本的二进制文件。 +3. 解压得到 apache-iotdb-1.3.0-all-bin 目录。 使用源码编译 @@ -764,14 +764,14 @@ iotdbctl cluster activate default_cluster -N confignode1 -op license_path ``` git clone https://github.com/apache/iotdb.git -git checkout v1.0.0 +git checkout v1.3.0 ``` **官网下载** 1. 打开官网[Download Page](https://iotdb.apache.org/Download/)。 2. 下载 IoTDB 1.0.0 版本的源码。 -3. 解压得到 apache-iotdb-1.0.0 目录。 +3. 解压得到 apache-iotdb-1.3.0 目录。 # 编译源码 @@ -782,12 +782,12 @@ mvn clean package -pl distribution -am -DskipTests ``` 编译成功后，可在目录 -**distribution/target/apache-iotdb-1.0.0-SNAPSHOT-all-bin/apache-iotdb-1.0.0-SNAPSHOT-all-bin** +**distribution/target/apache-iotdb-1.3.0-SNAPSHOT-all-bin/apache-iotdb-1.3.0-SNAPSHOT-all-bin** 找到集群版本的二进制文件。 ### 安装包说明 -打开 apache-iotdb-1.0.0-SNAPSHOT-all-bin，可见以下目录： +打开 apache-iotdb-1.3.0-SNAPSHOT-all-bin，可见以下目录： | **目录** | **说明** | | | | @@ -803,7 +803,7 @@ mvn clean package -pl distribution -am -DskipTests 集群安装 -`apache-iotdb-1.0.0-SNAPSHOT-all-bin` 包含 ConfigNode 和 DataNode， +`apache-iotdb-1.3.0-SNAPSHOT-all-bin` 包含 ConfigNode 和 DataNode， 请将安装包部署于你目标集群的所有机器上，推荐将安装包部署于所有服务器的相同目录下。 如果你希望先在一台服务器上尝试部署 IoTDB 集群，请参考 @@ -812,7 +812,7 @@ mvn clean package -pl distribution -am -DskipTests 集群配置 接下来需要修改每个服务器上的配置文件，登录服务器， -并将工作路径切换至 `apache-iotdb-1.0.0-SNAPSHOT-all-bin`， +并将工作路径切换至 `apache-iotdb-1.3.0-SNAPSHOT-all-bin`， 配置文件在 `./conf` 目录内。 对于所有部署 ConfigNode 的服务器，需要修改通用配置（见 5.2.1）和 ConfigNode 配置（见 5.2.2）。 diff --git a/src/zh/UserGuide/V1.3.x/QuickStart/ClusterQuickStart.md b/src/zh/UserGuide/V1.3.x/QuickStart/ClusterQuickStart.md index a2caf2a..d7dfa5d 100644 --- a/src/zh/UserGuide/V1.3.x/QuickStart/ClusterQuickStart.md +++ b/src/zh/UserGuide/V1.3.x/QuickStart/ClusterQuickStart.md @@ -25,6 +25,8 @@ [FAQ](../FAQ/Frequently-asked-questions.md) ## 1. 安装部署 + + 我们将以最小的改动，启动一个含有3个 ConfigNode 和3个DataNode(3C3D)集群： - 数据/元数据副本数为1 - 集群名称为defaultCluster @@ -68,10 +70,10 @@ IP地址和服务角色分配如下： | 配置| 配置项 | IP:192.168.132.10 | IP:192.168.132.11 | IP:192.168.132.12 | ||:---|--|--|:-| | iotdb-confignode.properties | cn\_internal\_address | 192.168.132.10 | 192.168.132.11 | 192.168.132.12 | -|| cn\_target\_config\_node\_list | 192.168.132.10:10710 | 192.168.132.10:10710 | 192.168.132.10:10710 | +|| cn_seed_config_node | 192.168.132.10:10710 | 192.168.132.10:10710 | 192.168.132.10:10710 | | iotdb-datanode.properties | dn\_rpc\_address | 192.168.132.10 | 192.168.132.11 | 192.168.132.12 | || dn\_internal\_address | 192.168.132.10 | 192.168.132.11 | 192.168.132.12 | -|| dn\_target\_config\_node\_list | 192.168.132.10:10710 | 192.168.132.10:10710 | 192.168.132.10:10710 | +|| dn_seed_config_node | 192.168.132.10:10710 | 192.168.132.10:10710 | 192.168.132.10:10710 | **注意：** 我们推荐所有节点的 iotdb-common.properties 和 JVM 的内存配置是一致的。 @@ -79,7 +81,7 @@ IP地址和服务角色分配如下： ### 1.3. 启动集群 启动集群前，需保证配置正确，保证 IoTDB 安装目录下没有数据(`data`目录)。 1.3.1. 启动第一个节点 -
(iotdb) branch ty/tsfileMove deleted (was 186f6f71d27)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch ty/tsfileMove in repository https://gitbox.apache.org/repos/asf/iotdb.git was 186f6f71d27 add .gitignore The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb) branch master updated: Move path related antlr defined files to tsfile module (#11813)
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 88feb511cb5 Move path related antlr defined files to tsfile module
(#11813)
88feb511cb5 is described below
commit 88feb511cb562c12d3a37c84d1c27f99282bd36c
Author: Jackie Tien
AuthorDate: Tue Jan 2 20:00:11 2024 +0800
Move path related antlr defined files to tsfile module (#11813)
---
.gitignore | 2 +
.../db/queryengine/plan/parser/ASTVisitor.java | 7 +-
iotdb-core/tsfile/pom.xml | 56 +-
.../antlr4/org/apache/tsfile/parser/PathLexer.g4 | 212 +
.../antlr4/org/apache/tsfile/parser}/PathParser.g4 | 9 +-
.../tsfile/common/constant/TsFileConstant.java | 4 -
.../read/common/parser/PathNodesGenerator.java | 8 +-
.../tsfile/read/common/parser/PathVisitor.java | 6 +-
8 files changed, 285 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index b33d12e672b..2ec38495e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,6 +124,8 @@ iotdb-client/client-py/LICENSE
iotdb-core/antlr/gen/
iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/gen/
iotdb-core/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.tokens
+iotdb-core/tsfile/gen/
+iotdb-core/tsfile/src/main/antlr4/org/apache/tsfile/parser/gen/
# Develocity
.mvn/.gradle-enterprise/
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index 3f12fe84b30..2d31694eab6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -223,6 +223,7 @@ import java.util.Map;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES;
@@ -259,6 +260,10 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor {
private static final String LIMIT_CONFIGURATION_ENABLED_ERROR_MSG =
"Limit configuration is not enabled, please enable it first.";
+ private static final String NODE_NAME_IN_INTO_PATH_MATCHER =
"([a-zA-Z0-9_${}\\u2E80-\\u9FFF]+)";
+ private static final Pattern NODE_NAME_IN_INTO_PATH_PATTERN =
+ Pattern.compile(NODE_NAME_IN_INTO_PATH_MATCHER);
+
private static final String IGNORENULL = "IgnoreNull";
private ZoneId zoneId;
@@ -2032,7 +2037,7 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor {
private static void checkNodeNameInIntoPath(String src) {
// ${} are allowed
-if (!TsFileConstant.NODE_NAME_IN_INTO_PATH_PATTERN.matcher(src).matches())
{
+if (!NODE_NAME_IN_INTO_PATH_PATTERN.matcher(src).matches()) {
throw new SemanticException(
String.format(
"%s is illegal, unquoted node name in select into clause can
only consist of digits, characters, $, { and }",
diff --git a/iotdb-core/tsfile/pom.xml b/iotdb-core/tsfile/pom.xml
index 07db3bbc312..4849955a60b 100644
--- a/iotdb-core/tsfile/pom.xml
+++ b/iotdb-core/tsfile/pom.xml
@@ -40,11 +40,6 @@
common-api
${project.version}
-
-org.apache.iotdb
-iotdb-antlr
-1.3.1-SNAPSHOT
-
com.github.luben
zstd-jni
@@ -113,6 +108,57 @@
+
+org.antlr
+antlr4-maven-plugin
+
+
+
+antlr4
+
+
+false
+true
+
src/main/antlr4/org/apache/tsfile/parser
+
+
+
+
+
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+add-source
+
+add-source
+
+generate-sources
+
+
+
${project.build.directory}/generated-sources/antlr4
+
+
+
+
+
+
+org.apache.maven.plu
(iotdb) branch test deleted (was 9ceba0f95c4)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/iotdb.git was 9ceba0f95c4 PBTree: Fix NPE in SchemaFile conccurency control (#11770) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb) branch test created (now 9ceba0f95c4)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch test in repository https://gitbox.apache.org/repos/asf/iotdb.git at 9ceba0f95c4 PBTree: Fix NPE in SchemaFile conccurency control (#11770) No new revisions were added by this update.
(iotdb-docs) branch chrisdutz-patch-1 deleted (was d3667fe)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch chrisdutz-patch-1 in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git was d3667fe Merge branch 'main' into chrisdutz-patch-1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch chrisdutz-patch-1 updated (46ba3d1 -> d3667fe)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch chrisdutz-patch-1 in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git from 46ba3d1 docs: Removed the reference to the "with-tools" profile add 6229671 #55 English version (#60) add 2a5d70a Add english version for performance chapter (#58) add 2b042c9 Move to basic concept (#63) add e29fe15 Add performance chapter for V1.2 (#65) add e5ce77a rewrite the cluster quickStart part: replace 127.0.0.1 with real IP a… (#52) add 27ae0d9 Delete deprecated docs about CREATE SNAPSHOT FOR SCHEMA (#61) add 3c1493b fix bug that some titles are too long to be 2 lines (#51) add a3688d6 Add title for performance (#68) add fc97b94 Add hot load compaction configs (#38) add 461b71e rest add insertRecords doc (#67) add 9fd9868 add the miss file of configuration and a monitor file (#66) add ca8e1d2 pipe: update Chinese user docs (#71) add d84a82d Remove useless config (#74) add 5c13e26 Add count_time aggregation usage doc (#73) add 7748285 fix some doc of 1.2 (#70) add 6f239bf Repair the data_region_group_num parameter error (#81) add 2679b10 add doc Deployment-Recommendation and remove doc Get-Installation-Package to stage (#83) add c1438e7 Pipe docs updates: Data-Sync & Streaming (#78) add 1ad07d1 Update Deployment-Guide related docs (#79) add e0ff1fa Pipe: update images (#85) add 35c659a update 1.2.0 download links (#86) add f940e3c add resource recommend doc in sidebar Engilish (#89) add d6f7d15 Add overlap validation and repair tool docs (#75) add 475c618 feat(version): add 1.2 (#88) add 3dcf4cf [IOTDB-6144] Adjust the default thrift timeout parameter to 60s (#90) add d085b80 update Grafana-Plugin doc (#80) add 2613aa9 add missing file and fix bad url of V1.2 (#87) add 990516e Add flink-sql-iotdb-connector docs (#76) add abe9b35 Update flink docs (#91) add 3b8d1da fix part of bad URL of the English version (#92) add 374f563 update 1.2.1 download links (#93) add cec2ebc fix: remove UNSUPPORTED API (#94) add fcb1385 add the English version of UDF-lib and fix the rest of dead url in V1.2 (#95) add bc57209 add the dbeaver-jar download URL of V1.2 (#96) add 7772212 fix the url that can`t be detected by tools (#98) add 67ec499 Bump postcss from 8.4.25 to 8.4.31 (#99) add 5adf532 translate the doc of pipe into English of V1.2 (#97) add 70a169d add authority management file add fb2450b Update 1.2.2 links (#103) add 79d0a08 add authority management file to master branch add e8b93c7 refine ratis properties (#84) add 092d86a fix title bug and add English doc (#100) add 9079cd0 feat(download):remove 1.1.2 download url (#105) add 930f1d1 Bump @babel/traverse from 7.22.8 to 7.23.2 (#108) add c6dc88c fix wrong thing in Tiered Storage doc and delete the doc overlap in secuity management (#107) add 5874e43 fix restApi insertRecords interface param inaccuracy(#119) add 52f17ca Update SQL-Manual.md (#120) add b8bac5a docs(env):change docs about memory (#118) add bfbf784 update the doc of data sync (#116) add 9ae0206 [8443] fix the pathname erro in doc (#121) add c300e18 IoTDB SSL parameter configuration (#117) add 9db5ffc auth.add eng doc. (#113) add 9e09fdf fix csharp example error in using tablet (#122) add e3fc8d4 update rest insertRecords doc (#124) add e316a85 fix error path (#128) add bb39ee6 fix(authority): error break line (#127) add 74d3884 Add Telegraf IoTDB Output Plugin Usage doc (#123) add a20b797 [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#114) add 906a8a3 update iotdb-deploy doc (#72) add e754976 Rest configuration is adjusted from iotdb-common.properties to iotdb-datanode.properties (#115) add a2e198d add V1.3 doc (#130) add dfa4358 feat(init v1.3) (#126) add f2655c3 fix the V 1.3 doc of English file (#131) add 0e773ff fix the English doc of V 1.3 about config files (#132) add 0cf0978 fix bad url of V1.3 and master (#133) add 580bee7 fix(ainode): fix error format (#135) add d3667fe Merge branch 'main' into chrisdutz-patch-1 No new revisions were added by this update. Summary of changes: package-lock.json | 7248 +--- package.json | 33 +- src/.vuepress/navbar/en.ts |3 +- src/.vuepress/navbar/zh.ts |3 +- src/.vuepress/sidebar/V0.13.x/en.ts|6 +- src/.vuepress/sidebar/V1.1.x/en.ts |6 +- src/.vuepress/sidebar/V1.2.x/en.ts
(iotdb-docs) branch main updated: fix(ainode): fix error format (#135)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 580bee7 fix(ainode): fix error format (#135) 580bee7 is described below commit 580bee7fe203347909a6085a35add7edf360a69d Author: CritasWang AuthorDate: Fri Dec 15 18:05:59 2023 +0800 fix(ainode): fix error format (#135) --- .../Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md | 2 +- .../V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md index a4e0ba4..3544370 100644 --- a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -1380,7 +1380,7 @@ AINode启动过程中支持两种参数，其具体的作用如下图所示： | **名称**| **作用脚本** | 标签 | **描述** | **类型** | **默认值** | 输入方式 | | --- | | | | | | - | | ain_interpreter_dir | start remove env | -i | AINode所安装在的虚拟环境的解释器路径，需要使用绝对路径 | String | 默认读取环境变量 | 调用时输入+持久化修改 | -| ain_remove_target | remove stop | -t | AINode关闭时可以指定待移除的目标AINode的Node ID、地址和端口号，格式为/: | String | 无 | 调用时输入| +| ain_remove_target | remove stop | -t | AINode关闭时可以指定待移除的目标AINode的Node ID、地址和端口号，格式为`/:` | String | 无 | 调用时输入| | ain_force_reinstall | start remove env | -r | 该脚本在检查AINode安装情况的时候是否检查版本，如果检查则在版本不对的情况下会强制安装lib里的whl安装包 | Bool | false | 调用时输入| | ain_no_dependencies | start remove env | -n | 指定在安装AINode的时候是否安装依赖，如果指定则仅安装AINode主程序而不安装依赖。 | Bool | false| 调用时输入| diff --git a/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md b/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md index 4964d01..8d197da 100644 --- a/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md +++ b/src/zh/UserGuide/V1.3.x/Deployment-and-Maintenance/Deployment-Guide_timecho.md @@ -1380,7 +1380,7 @@ AINode启动过程中支持两种参数，其具体的作用如下图所示： | **名称**| **作用脚本** | 标签 | **描述** | **类型** | **默认值** | 输入方式 | | --- | | | | | | - | | ain_interpreter_dir | start remove env | -i | AINode所安装在的虚拟环境的解释器路径，需要使用绝对路径 | String | 默认读取环境变量 | 调用时输入+持久化修改 | -| ain_remove_target | remove stop | -t | AINode关闭时可以指定待移除的目标AINode的Node ID、地址和端口号，格式为/: | String | 无 | 调用时输入| +| ain_remove_target | remove stop | -t | AINode关闭时可以指定待移除的目标AINode的Node ID、地址和端口号，格式为`/:` | String | 无 | 调用时输入| | ain_force_reinstall | start remove env | -r | 该脚本在检查AINode安装情况的时候是否检查版本，如果检查则在版本不对的情况下会强制安装lib里的whl安装包 | Bool | false | 调用时输入| | ain_no_dependencies | start remove env | -n | 指定在安装AINode的时候是否安装依赖，如果指定则仅安装AINode主程序而不安装依赖。 | Bool | false| 调用时输入|
(iotdb) branch master updated: Enhance the note of parameter seed_config_node (#11685)
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 60d66ae873f Enhance the note of parameter seed_config_node (#11685) 60d66ae873f is described below commit 60d66ae873fc7f9c60206a84ce6985ecec672d53 Author: Potato AuthorDate: Mon Dec 11 14:03:22 2023 +0800 Enhance the note of parameter seed_config_node (#11685) --- .../confignode/src/assembly/resources/conf/iotdb-confignode.properties | 2 ++ .../datanode/src/assembly/resources/conf/iotdb-datanode.properties | 2 ++ 2 files changed, 4 insertions(+) diff --git a/iotdb-core/confignode/src/assembly/resources/conf/iotdb-confignode.properties b/iotdb-core/confignode/src/assembly/resources/conf/iotdb-confignode.properties index 158d9f94670..96dbbd876e3 100644 --- a/iotdb-core/confignode/src/assembly/resources/conf/iotdb-confignode.properties +++ b/iotdb-core/confignode/src/assembly/resources/conf/iotdb-confignode.properties @@ -40,6 +40,8 @@ cn_consensus_port=10720 # For the first ConfigNode to start, cn_seed_config_node points to its own cn_internal_address:cn_internal_port. # For other ConfigNodes that to join the cluster, cn_seed_config_node points to any running ConfigNode's cn_internal_address:cn_internal_port. +# Note: After this ConfigNode successfully joins the cluster for the first time, this parameter is no longer used. +# Each node automatically maintains the list of ConfigNodes and traverses connections when restarting. # Format: address:port e.g. 127.0.0.1:10710 # Datatype: String cn_seed_config_node=127.0.0.1:10710 diff --git a/iotdb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties b/iotdb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties index f51b56e8b83..0bd8fda9e8a 100644 --- a/iotdb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties +++ b/iotdb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties @@ -84,6 +84,8 @@ dn_data_region_consensus_port=10760 # dn_seed_config_node points to any running ConfigNode's cn_internal_address:cn_internal_port. # Format: address:port(,address:port)* e.g. 127.0.0.1:10710,127.0.0.1:10711 +# Note: After this DataNode successfully joins the cluster for the first time, this parameter is no longer used. +# Each node automatically maintains the list of ConfigNodes and traverses connections when restarting. # Datatype: String dn_seed_config_node=127.0.0.1:10710
(iotdb) branch enhance_seed_confignode_message deleted (was c8961c05542)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch enhance_seed_confignode_message in repository https://gitbox.apache.org/repos/asf/iotdb.git was c8961c05542 enhance The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch main updated: add V1.3 doc (#130)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new a2e198d add V1.3 doc (#130) a2e198d is described below commit a2e198d258eff0d18cbecc17f750b6a37c629c19 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Fri Dec 8 17:29:18 2023 +0800 add V1.3 doc (#130) --- .../Master/Reference/Common-Config-Manual.md | 4 +- .../Master/Reference/ConfigNode-Config-Manual.md | 4 +- .../Master/Reference/DataNode-Config-Manual.md | 4 +- .../Master/User-Manual/Data-Sync_timecho.md| 388 ++ .../Master/User-Manual/Streaming_timecho.md| 798 + 5 files changed, 1192 insertions(+), 6 deletions(-) diff --git a/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md b/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md index 10ff1ed..79ec0b2 100644 --- a/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md +++ b/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md @@ -236,9 +236,9 @@ IoTDB ConfigNode 和 DataNode 的公共配置参数位于 `conf` 目录下。 |默认值| true | | 改后生效方式 | 重启服务生效 | -* storage\_query_schema_consensus_free_memory_proportion +* datanode\_memory\_proportion -|名字| data\_node\_memory\_proportion | +|名字| datanode\_memory\_proportion | |:---:|:--| |描述| 存储，查询，元数据，流处理引擎，共识层，空闲内存比例 | |类型| Ratio | diff --git a/src/zh/UserGuide/Master/Reference/ConfigNode-Config-Manual.md b/src/zh/UserGuide/Master/Reference/ConfigNode-Config-Manual.md index 21931f9..a3ad6e9 100644 --- a/src/zh/UserGuide/Master/Reference/ConfigNode-Config-Manual.md +++ b/src/zh/UserGuide/Master/Reference/ConfigNode-Config-Manual.md @@ -95,9 +95,9 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。 ### 目标 Config Node 配置 -* cn\_target\_config\_node\_list +* cn\_seed\_config\_node -| 名字 | cn\_target\_config\_node\_list| +| 名字 | cn\_seed\_config\_node| |:--:|:--| | 描述 | 目标 ConfigNode 地址，ConfigNode 通过此地址加入集群 | | 类型 | String| diff --git a/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md b/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md index 028307f..54eb7ab 100644 --- a/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md +++ b/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md @@ -203,9 +203,9 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB ### 目标 Config Nodes 配置 -* dn\_target\_config\_node\_list +* dn\_seed\_config\_node -|名字| dn\_target\_config\_node\_list | +|名字| dn\_seed\_config\_node | |:---:|:| |描述| ConfigNode 地址，DataNode 启动时通过此地址加入集群 | |类型| String | diff --git a/src/zh/UserGuide/Master/User-Manual/Data-Sync_timecho.md b/src/zh/UserGuide/Master/User-Manual/Data-Sync_timecho.md new file mode 100644 index 000..b1344ca --- /dev/null +++ b/src/zh/UserGuide/Master/User-Manual/Data-Sync_timecho.md @@ -0,0 +1,388 @@ + + +# 数据同步 +数据同步是工业物联网的典型需求，通过数据同步机制，可实现IoTDB之间的数据共享，搭建完整的数据链路来满足内网外网数据互通、端边云同步、数据迁移、数据备份等需求。 + +## 功能介绍 + +### 同步任务概述 + +一个数据同步任务包含2个阶段： + +- 抽取（Source）阶段：该部分用于从源 IoTDB 抽取数据，在SQL语句中的 source 部分定义 +- 发送（Sink）阶段：该部分用于向目标 IoTDB 发送数据，在SQL语句中的 sink 部分定义 + + + +通过 SQL 语句声明式地配置2个部分的具体内容，可实现灵活的数据同步能力。 + +### 同步任务 - 创建 + +使用 `CREATE PIPE` 语句来创建一条数据同步任务，下列属性中`PipeId`和`sink`为必填项，`source`和`processor`为选填项，输入SQL时注意 `SOURCE `与 `SINK` 插件顺序不能替换。 + +SQL 示例如下： + +```SQL +CREATE PIPE -- PipeId 是能够唯一标定任务任务的名字 +-- 数据抽取插件，必填插件 +WITH SOURCE ( + [ = ,], +-- 数据连接插件，必填插件 +WITH SINK ( + [ = ,], +) +``` +> 注：使用数据同步功能，请保证接收端开启自动创建元数据 + + + +### 同步任务 - 管理 + +数据同步任务有三种状态：RUNNING、STOPPED和DROPPED。任务状态转换如下图所示： + + + +一个数据同步任务在生命周期中会经过多种状态： + +- RUNNING： 运行状态。 +- STOPPED： 停止状态。 + - 说明1：任务的初始状态为停止状态，需要使用SQL语句启动任务 + - 说明2：用户也可以使用SQL语句手动将一个处于运行状态的任务停止，此时状态会从 RUNNING 变为 STOPPED + - 说明3：当一个任务出现无法恢复的错误时，其状态会自动从 RUNNING 变为 STOPPED +- DROPPED：删除状态。 + +我们提供以下SQL语句对同步任务进行状态管理。 + + 启动任务 + +创建之后，任务不会立即被处理，需要启动任务。使用`START PIPE`语句来启动任务，从而开始处理数据： + +```Go +START PIPE +``` + + 停止任务 + +停止处理数据： + +```Go +STOP PIPE +``` + + 删除任务 + +删除指定任务： + +```Go +DROP PIPE +``` +删除任务不需要先停止同步任务。 + 查看任务 + +查看全部任务： + +```Go +SHOW PIPES +``` + +查看指定任务： + +```Go +SHOW PIPE +``` + +### 插件 + +为了使得整体架构更加灵活以匹配不同的同步场景需求，在上述同步任务框架中IoTDB支持进行插件组装。系统为您预置了一些常用插件可直接使用，同时您也可以自定义 sink 插件，并加载至IoTDB系统进行使用。 + +| 模块 | 插件 | 预置插件 | 自定义插件 | +| --- | --- | --- | --- | +| 抽取（Source） | Source 插件 | iotdb-source | 不支持 | +| 发送（Sink） | Sink 插
(iotdb-docs) branch main updated: Rest configuration is adjusted from iotdb-common.properties to iotdb-datanode.properties (#115)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new e754976 Rest configuration is adjusted from iotdb-common.properties to iotdb-datanode.properties (#115) e754976 is described below commit e7549764f57378e0f909903caeeaba731ead97c8 Author: CloudWise-Lukemiao <76942485+cloudwise-lukem...@users.noreply.github.com> AuthorDate: Fri Dec 8 11:30:11 2023 +0800 Rest configuration is adjusted from iotdb-common.properties to iotdb-datanode.properties (#115) --- src/UserGuide/Master/API/RestServiceV1.md | 2 +- src/UserGuide/Master/API/RestServiceV2.md | 2 +- .../Master/Reference/Common-Config-Manual.md | 119 - .../Master/Reference/DataNode-Config-Manual.md | 102 ++ src/zh/UserGuide/Master/API/RestServiceV1.md | 3 +- src/zh/UserGuide/Master/API/RestServiceV2.md | 2 +- .../Master/Reference/Common-Config-Manual.md | 119 - .../Master/Reference/DataNode-Config-Manual.md | 101 + 8 files changed, 208 insertions(+), 242 deletions(-) diff --git a/src/UserGuide/Master/API/RestServiceV1.md b/src/UserGuide/Master/API/RestServiceV1.md index 80b6204..2048c3c 100644 --- a/src/UserGuide/Master/API/RestServiceV1.md +++ b/src/UserGuide/Master/API/RestServiceV1.md @@ -845,7 +845,7 @@ Sample response: ## Configuration -The configuration is located in 'iotdb-rest.properties'. +The configuration is located in 'iotdb-datanode.properties'. * Set 'enable_rest_service' to 'true' to enable the module, and 'false' to disable the module. By default, this value is' false '. diff --git a/src/UserGuide/Master/API/RestServiceV2.md b/src/UserGuide/Master/API/RestServiceV2.md index 799346c..900dfe5 100644 --- a/src/UserGuide/Master/API/RestServiceV2.md +++ b/src/UserGuide/Master/API/RestServiceV2.md @@ -885,7 +885,7 @@ Sample response: ## Configuration -The configuration is located in 'iotdb-rest.properties'. +The configuration is located in 'iotdb-datanode.properties'. * Set 'enable_rest_service' to 'true' to enable the module, and 'false' to disable the module. By default, this value is' false '. diff --git a/src/UserGuide/Master/Reference/Common-Config-Manual.md b/src/UserGuide/Master/Reference/Common-Config-Manual.md index 3cbee01..6d93505 100644 --- a/src/UserGuide/Master/Reference/Common-Config-Manual.md +++ b/src/UserGuide/Master/Reference/Common-Config-Manual.md @@ -1959,123 +1959,4 @@ Different configuration parameters take effect in the following three ways: | Default | 1048576 | | Effective | hot-load | -### REST Service Configuration - -* enable\_rest\_service - -|Name| enable\_rest\_service | -|:---:|:--| -|Description| Whether to enable the Rest service| -|Type| Boolean | -|Default| false | -|Effective| After restarting system | - -* rest\_service\_port - -|Name| rest\_service\_port | -|:---:|:--| -|Description| The Rest service listens to the port number | -|Type| int32 | -|Default| 18080 | -|Effective| After restarting system | - -* enable\_swagger - -|Name| enable\_swagger | -|:---:|:---| -|Description| Whether to enable swagger to display rest interface information | -|Type| Boolean| -|Default| false | -|Effective| After restarting system | - -* rest\_query\_default\_row\_size\_limit - -|Name| rest\_query\_default\_row\_size\_limit | -|:---:|:--| -|Description| The maximum number of rows in a result set that can be returned by a query| -|Type| int32 | -|Default| 1 | -|Effective| After restarting system | - -* cache\_expire - -|Name| cache\_expire| -|:---:|:| -|Description| Expiration time for caching customer login information | -|Type| int32 | -|Default| 28800 | -|Effective| After restarting system | - -* cache\_max\_num - -|Name| cache\_max\_num | -|:---:|:--| -|Description| The m
(iotdb-docs) branch Rename-storage_query_schema_consensus_free_memory_proportion-to-datanode_memory_proportion deleted (was 89306c0)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch Rename-storage_query_schema_consensus_free_memory_proportion-to-datanode_memory_proportion in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git was 89306c0 update default value The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(iotdb-docs) branch main updated: [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#114)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new a20b797 [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#114) a20b797 is described below commit a20b797027d94a5b6492b6dfce6ba7279dce67cb Author: Yongzao <532741...@qq.com> AuthorDate: Thu Dec 7 19:30:46 2023 +0800 [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#114) --- .../Master/Deployment-and-Maintenance/Deployment-Recommendation.md | 4 ++-- src/UserGuide/Master/Reference/Common-Config-Manual.md | 6 +++--- .../Master/Deployment-and-Maintenance/Deployment-Recommendation.md | 4 ++-- src/zh/UserGuide/Master/Reference/Common-Config-Manual.md | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md index 16be276..5fd59f9 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md @@ -133,11 +133,11 @@ Temp storage size = WAL storage size + Consensus storage size + Compaction temp 1. WAL max wal storage size = memtable memory size ÷ wal_min_effective_info_ratio -- memtable memory size is decided by storage_query_schema_consensus_free_memory_proportion, storage_engine_memory_proportion and write_memory_proportion +- memtable memory size is decided by datanode_memory_proportion, storage_engine_memory_proportion and write_memory_proportion - wal_min_effective_info_ratio is decided by wal_min_effective_info_ratio configuration > Example: allocate 16G memory for DataNode, config is as below: -> storage_query_schema_consensus_free_memory_proportion=3:3:1:1:2 +> datanode_memory_proportion=3:3:1:1:1:1 > storage_engine_memory_proportion=8:2 > write_memory_proportion=19:1 > wal_min_effective_info_ratio=0.1 diff --git a/src/UserGuide/Master/Reference/Common-Config-Manual.md b/src/UserGuide/Master/Reference/Common-Config-Manual.md index 53b11f7..3cbee01 100644 --- a/src/UserGuide/Master/Reference/Common-Config-Manual.md +++ b/src/UserGuide/Master/Reference/Common-Config-Manual.md @@ -236,11 +236,11 @@ Different configuration parameters take effect in the following three ways: * storage\_query_schema_consensus_free_memory_proportion -|Name| storage\_query\_schema\_consensus\_free\_memory\_proportion | +|Name| data\_node\_memory\_proportion | |:---:|:-| -|Description| Memory Allocation Ratio: StorageEngine, QueryEngine, SchemaEngine, Consensus and Free Memory | +|Description| Memory Allocation Ratio: StorageEngine, QueryEngine, SchemaEngine, StreamingEngine, Consensus and Free Memory | |Type| Ratio | -|Default| 3:3:1:1:2 | +|Default| 3:3:1:1:1:1 | |Effective| After restarting system | * schema\_memory\_allocate\_proportion diff --git a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md index d998db0..74f39c9 100644 --- a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md +++ b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md @@ -133,11 +133,11 @@ IoTDB 存储空间=数据存储空间 + 元数据存储空间 + 临时存储空 1. 写前日志 最大写前日志空间占用 = memtable 总内存占用 ÷ 最小有效信息占比 -- memtable 总内存占用和 storage_query_schema_consensus_free_memory_proportion、storage_engine_memory_proportion、write_memory_proportion 三个参数有关 +- memtable 总内存占用和 datanode_memory_proportion、storage_engine_memory_proportion、write_memory_proportion 三个参数有关 - 最小有效信息占比由 wal_min_effective_info_ratio 决定 > 示例：为 IoTDB 分配 16G 内存，配置文件如下 -> storage_query_schema_consensus_free_memory_proportion=3:3:1:1:2 +> datanode_memory_proportion=3:3:1:1:1:1 > storage_engine_memory_proportion=8:2 > write_memory_proportion=19:1 > wal_min_effective_info_ratio=0.1 diff --git a/src/zh/UserGuide/Master/Reference/Common-Config-Manual.md b/src/zh/UserGuid
(iotdb-docs) branch main updated: Add Telegraf IoTDB Output Plugin Usage doc (#123)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 74d3884 Add Telegraf IoTDB Output Plugin Usage doc (#123)
74d3884 is described below
commit 74d38845c72cfdcf89219d41f5007b0a28a34032
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Thu Dec 7 19:29:34 2023 +0800
Add Telegraf IoTDB Output Plugin Usage doc (#123)
---
src/.vuepress/sidebar/V1.2.x/en.ts | 1 +
src/.vuepress/sidebar/V1.2.x/zh.ts | 1 +
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 1 +
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 1 +
.../Master/Ecosystem-Integration/Telegraf-IoTDB.md | 110 +
.../V1.2.x/Ecosystem-Integration/Telegraf-IoTDB.md | 110 +
.../Master/Ecosystem-Integration/Telegraf-IoTDB.md | 110 +
.../V1.2.x/Ecosystem-Integration/Telegraf-IoTDB.md | 110 +
8 files changed, 444 insertions(+)
diff --git a/src/.vuepress/sidebar/V1.2.x/en.ts
b/src/.vuepress/sidebar/V1.2.x/en.ts
index 3c085b3..e8da576 100644
--- a/src/.vuepress/sidebar/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar/V1.2.x/en.ts
@@ -143,6 +143,7 @@ export const enSidebar = {
{ text: 'Flink TsFile Connector', link: 'Flink-TsFile' },
{ text: 'NiFi IoTDB Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB', link: 'DBeaver' },
+{ text: 'Telegraf-IoTDB Output Plugin', link: 'Telegraf-IoTDB'},
],
},
{
diff --git a/src/.vuepress/sidebar/V1.2.x/zh.ts
b/src/.vuepress/sidebar/V1.2.x/zh.ts
index 8c6d188..3e2b03d 100644
--- a/src/.vuepress/sidebar/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.2.x/zh.ts
@@ -143,6 +143,7 @@ export const zhSidebar = {
{ text: 'Flink-TsFile-Connector', link: 'Flink-TsFile' },
{ text: 'NiFi-IoTDB-Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB 集成方案', link: 'DBeaver' },
+{ text: 'Telegraf-IoTDB Output 插件', link: 'Telegraf-IoTDB'},
],
},
{
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
index ab73416..6a38e2d 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
@@ -146,6 +146,7 @@ export const enSidebar = {
{ text: 'Flink TsFile Connector', link: 'Flink-TsFile' },
{ text: 'NiFi IoTDB Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB', link: 'DBeaver' },
+{ text: 'Telegraf-IoTDB Output Plugin', link: 'Telegraf-IoTDB'},
],
},
{
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
index 7b1ca83..2c5030d 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
@@ -146,6 +146,7 @@ export const zhSidebar = {
{ text: 'Flink-TsFile-Connector', link: 'Flink-TsFile' },
{ text: 'NiFi-IoTDB-Connector', link: 'NiFi-IoTDB' },
{ text: 'DBeaver-IoTDB 集成方案', link: 'DBeaver' },
+{ text: 'Telegraf-IoTDB Output 插件', link: 'Telegraf-IoTDB'},
],
},
{
diff --git a/src/UserGuide/Master/Ecosystem-Integration/Telegraf-IoTDB.md
b/src/UserGuide/Master/Ecosystem-Integration/Telegraf-IoTDB.md
new file mode 100644
index 000..05f8926
--- /dev/null
+++ b/src/UserGuide/Master/Ecosystem-Integration/Telegraf-IoTDB.md
@@ -0,0 +1,110 @@
+
+
+# Telegraf Introduction
+Telegraf is an open-source agent that facilitates the collection, processing,
and transmission of metric data. Developed by InfluxData.
+Telegraf includes the following features:
+* Plugin Architecture: Telegraf's strength lies in its extensive plugin
ecosystem. It supports a wide range of input, output, and processor plugins,
allowing seamless integration with various data sources and destinations.
+* Data Collection: Telegraf excels in collecting metrics from diverse sources,
such as system metrics, logs, databases, and more. Its versatility makes it
suitable for monitoring applications, infrastructure, and IoT devices.
+* Output Destinations: Once collected, data can be sent to various output
destinations, including popular databases like InfluxDB. This flexibility makes
Telegraf adaptable to different monitoring and analytics setups.
+* Ease of Configuration: Telegraf's configuration is done using TOML files.
This simplicity allows users to define inputs, outputs, and processors with
ease, making customization straightforward.
+* Community and Support: Being open-source, Telegraf benefits from an active
community. Users can contribute plugins, report issues, and seek assistance
through forums and documentation.
+
+# Telegraf IoTDB Output Plugin
+This output plugin saves Telegraf metrics to an Apache IoTDB b
(iotdb-docs) branch main updated: fix(authority): error break line (#127)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new bb39ee6 fix(authority): error break line (#127) bb39ee6 is described below commit bb39ee67971bbf92fcba90c053ae277bb71d4c65 Author: CritasWang AuthorDate: Thu Dec 7 19:29:22 2023 +0800 fix(authority): error break line (#127) --- src/UserGuide/Master/User-Manual/Authority-Management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UserGuide/Master/User-Manual/Authority-Management.md b/src/UserGuide/Master/User-Manual/Authority-Management.md index 1c46894..c387639 100644 --- a/src/UserGuide/Master/User-Manual/Authority-Management.md +++ b/src/UserGuide/Master/User-Manual/Authority-Management.md @@ -84,7 +84,7 @@ The table below describes the types and scope of these permissions: | READ_DATA | Allows reading time series data under the authorized path. [...] | WRITE_DATA | Allows reading time series data under the authorized path.Allows inserting and deleting time series data under the authorized path.Allows importing and loading data under the authorized path. When importing data, you need the WRITE_DATA permission for the corresponding path. When automatically creating databases or time series, you need MANAGE_DATABASE and WRITE_SCHEMA permissions. [...] | READ_SCHEMA | Allows obtaining detailed information about the metadata tree under the authorized path, including databases, child paths, child nodes, devices, time series, templates, views, etc. [...] -| WRITE_SCHEMA| Allows obtaining detailed information about the metadata tree under the authorized path.Allows creating, deleting, and modifying time series, templates, views, etc. under the authorized path. When creating or modifying views, it checks the WRITE_SCHEMA permission for the view path and READ_SCHEMA permission for the data source. When querying and inserting data into views, it checks the READ_DATA and WRITE_DATA permissions for the view path. Allows setting, u [...] +| WRITE_SCHEMA| Allows obtaining detailed information about the metadata tree under the authorized path.Allows creating, deleting, and modifying time series, templates, views, etc. under the authorized path. When creating or modifying views, it checks the WRITE_SCHEMA permission for the view path and READ_SCHEMA permission for the data source. When querying and inserting data into views, it checks the READ_DATA and WRITE_DATA permissions for the view path. Allows setting, u [...] ### Global Permissions
(iotdb-docs) branch main updated: fix error path (#128)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new e316a85 fix error path (#128)
e316a85 is described below
commit e316a85e481d3ff6bb9879972b327c55a2b50087
Author: YuFengLiu <38746920+l2280...@users.noreply.github.com>
AuthorDate: Thu Dec 7 19:29:07 2023 +0800
fix error path (#128)
---
src/UserGuide/Master/API/Programming-MQTT.md| 2 +-
src/UserGuide/V1.0.x/API/Programming-MQTT.md| 2 +-
src/UserGuide/V1.1.x/API/Programming-MQTT.md| 2 +-
src/UserGuide/V1.2.x/API/Programming-MQTT.md| 2 +-
src/zh/UserGuide/Master/API/Programming-MQTT.md | 2 +-
src/zh/UserGuide/V1.0.x/API/Programming-MQTT.md | 2 +-
src/zh/UserGuide/V1.1.x/API/Programming-MQTT.md | 2 +-
src/zh/UserGuide/V1.2.x/API/Programming-MQTT.md | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/UserGuide/Master/API/Programming-MQTT.md
b/src/UserGuide/Master/API/Programming-MQTT.md
index eb21d15..46e9eca 100644
--- a/src/UserGuide/Master/API/Programming-MQTT.md
+++ b/src/UserGuide/Master/API/Programming-MQTT.md
@@ -59,7 +59,7 @@ or json array of the above two.
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
## MQTT Configurations
-The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties` by default.
+The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties` by default.
Configurations are as follows:
diff --git a/src/UserGuide/V1.0.x/API/Programming-MQTT.md
b/src/UserGuide/V1.0.x/API/Programming-MQTT.md
index 2d7203b..9b23976 100644
--- a/src/UserGuide/V1.0.x/API/Programming-MQTT.md
+++ b/src/UserGuide/V1.0.x/API/Programming-MQTT.md
@@ -59,7 +59,7 @@ or json array of the above two.
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
### MQTT Configurations
-The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties` by default.
+The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties` by default.
Configurations are as follows:
diff --git a/src/UserGuide/V1.1.x/API/Programming-MQTT.md
b/src/UserGuide/V1.1.x/API/Programming-MQTT.md
index ffd8b57..62bf01b 100644
--- a/src/UserGuide/V1.1.x/API/Programming-MQTT.md
+++ b/src/UserGuide/V1.1.x/API/Programming-MQTT.md
@@ -59,7 +59,7 @@ or json array of the above two.
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
### MQTT Configurations
-The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties` by default.
+The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties` by default.
Configurations are as follows:
diff --git a/src/UserGuide/V1.2.x/API/Programming-MQTT.md
b/src/UserGuide/V1.2.x/API/Programming-MQTT.md
index eb21d15..46e9eca 100644
--- a/src/UserGuide/V1.2.x/API/Programming-MQTT.md
+++ b/src/UserGuide/V1.2.x/API/Programming-MQTT.md
@@ -59,7 +59,7 @@ or json array of the above two.
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
## MQTT Configurations
-The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties` by default.
+The IoTDB MQTT service load configurations from
`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties` by default.
Configurations are as follows:
diff --git a/src/zh/UserGuide/Master/API/Programming-MQTT.md
b/src/zh/UserGuide/Master/API/Programming-MQTT.md
index 134ba26..76c0723 100644
--- a/src/zh/UserGuide/Master/API/Programming-MQTT.md
+++ b/src/zh/UserGuide/Master/API/Programming-MQTT.md
@@ -60,7 +60,7 @@ MQTT 主题与 IoTDB 时间序列相对应。
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
## MQTT 配置
-默认情况下，IoTDB MQTT
服务从`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties`加载配置。
+默认情况下，IoTDB MQTT 服务从`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties`加载配置。
配置如下：
diff --git a/src/zh/UserGuide/V1.0.x/API/Programming-MQTT.md
b/src/zh/UserGuide/V1.0.x/API/Programming-MQTT.md
index 2aedfaf..57a34ac 100644
--- a/src/zh/UserGuide/V1.0.x/API/Programming-MQTT.md
+++ b/src/zh/UserGuide/V1.0.x/API/Programming-MQTT.md
@@ -60,7 +60,7 @@ MQTT 主题与 IoTDB 时间序列相对应。
https://alioss.timecho.com/docs/img/github/78357469-1bf11880-75e4-11ea-978f-a53996667a0d.png;>
### MQTT 配置
-默认情况下，IoTDB MQTT
服务从`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-datanode.properties`加载配置。
+默认情况下，IoTDB MQTT 服务从`${IOTDB_HOME}/${IOTDB_CONF}/iotdb-common.properties`加载配置。
配置如下：
diff --git a/src/zh/UserGuide/V1.1.x/API/Programming-MQTT.md
b/src/zh/UserGuide/V1.1.x/API/Programmi
(iotdb-docs) branch main updated: update rest insertRecords doc (#124)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new e3fc8d4 update rest insertRecords doc (#124)
e3fc8d4 is described below
commit e3fc8d4a3ceac4fa829697e1714eb1e4d03257e2
Author: CloudWise-Lukemiao
<76942485+cloudwise-lukem...@users.noreply.github.com>
AuthorDate: Thu Dec 7 17:31:38 2023 +0800
update rest insertRecords doc (#124)
---
src/UserGuide/Master/API/RestServiceV2.md| 3 ++-
src/UserGuide/V1.2.x/API/RestServiceV2.md| 3 ++-
src/zh/UserGuide/Master/API/RestServiceV2.md | 3 ++-
src/zh/UserGuide/V1.2.x/API/RestServiceV2.md | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/UserGuide/Master/API/RestServiceV2.md
b/src/UserGuide/Master/API/RestServiceV2.md
index 41e753c..799346c 100644
--- a/src/UserGuide/Master/API/RestServiceV2.md
+++ b/src/UserGuide/Master/API/RestServiceV2.md
@@ -860,10 +860,11 @@ Parameter Description:
| data_types_list | array | yes | The data type |
| values_list | array | yes | Value columns, the values in each column
can be `null` |
| devices | string | yes | Device name |
+| is_aligned | boolean | yes | Whether to align the timeseries |
Example request:
```shell
-curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232143960,1635232143960],"measurements_list":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"data_types_list":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"values_list":[[1,11],[2.1,2],[4,6],[false,"cc"]],"devices":["root.s1","root.s1","root.s1","root.s3"]}'
http://127.0.0.1:18080/rest/v2/insertRecords
+curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232143960,1635232143960],"measurements_list":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"data_types_list":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"values_list":[[1,11],[2.1,2],[4,6],[false,"cc"]],"is_aligned":false,"devices":["root.s1","root.s1","root.s1","root.s3"]}'
http://127.0.0.1:18080/r [...]
```
Sample response:
diff --git a/src/UserGuide/V1.2.x/API/RestServiceV2.md
b/src/UserGuide/V1.2.x/API/RestServiceV2.md
index 41e753c..799346c 100644
--- a/src/UserGuide/V1.2.x/API/RestServiceV2.md
+++ b/src/UserGuide/V1.2.x/API/RestServiceV2.md
@@ -860,10 +860,11 @@ Parameter Description:
| data_types_list | array | yes | The data type |
| values_list | array | yes | Value columns, the values in each column
can be `null` |
| devices | string | yes | Device name |
+| is_aligned | boolean | yes | Whether to align the timeseries |
Example request:
```shell
-curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232143960,1635232143960],"measurements_list":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"data_types_list":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"values_list":[[1,11],[2.1,2],[4,6],[false,"cc"]],"devices":["root.s1","root.s1","root.s1","root.s3"]}'
http://127.0.0.1:18080/rest/v2/insertRecords
+curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232143960,1635232143960],"measurements_list":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"data_types_list":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"values_list":[[1,11],[2.1,2],[4,6],[false,"cc"]],"is_aligned&quo
(iotdb-docs) branch main updated: fix csharp example error in using tablet (#122)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 9e09fdf fix csharp example error in using tablet (#122)
9e09fdf is described below
commit 9e09fdfe76621a723c3de3e04c5dd34f3c8ac780
Author: YuFengLiu <38746920+l2280...@users.noreply.github.com>
AuthorDate: Thu Dec 7 11:47:19 2023 +0800
fix csharp example error in using tablet (#122)
---
src/UserGuide/Master/API/Programming-CSharp-Native-API.md| 2 +-
src/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md| 2 +-
src/zh/UserGuide/Master/API/Programming-CSharp-Native-API.md | 2 +-
src/zh/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/UserGuide/Master/API/Programming-CSharp-Native-API.md
b/src/UserGuide/Master/API/Programming-CSharp-Native-API.md
index c18db2a..9c7463a 100644
--- a/src/UserGuide/Master/API/Programming-CSharp-Native-API.md
+++ b/src/UserGuide/Master/API/Programming-CSharp-Native-API.md
@@ -93,7 +93,7 @@ await
session_pool.InsertRecordAsync("root.test_group.test_device", rowRecord);
// Insert Tablet
var timestamp_lst = new List{ timestamp + 1 };
-var value_lst = new List {new() {"iotdb", true, (int) 12}};
+var value_lst = new List {"iotdb", true, (int) 12};
var tablet = new Tablet("root.test_group.test_device", measures, value_lst,
timestamp_ls);
await session_pool.InsertTabletAsync(tablet);
diff --git a/src/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
b/src/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
index c18db2a..9c7463a 100644
--- a/src/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
+++ b/src/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
@@ -93,7 +93,7 @@ await
session_pool.InsertRecordAsync("root.test_group.test_device", rowRecord);
// Insert Tablet
var timestamp_lst = new List{ timestamp + 1 };
-var value_lst = new List {new() {"iotdb", true, (int) 12}};
+var value_lst = new List {"iotdb", true, (int) 12};
var tablet = new Tablet("root.test_group.test_device", measures, value_lst,
timestamp_ls);
await session_pool.InsertTabletAsync(tablet);
diff --git a/src/zh/UserGuide/Master/API/Programming-CSharp-Native-API.md
b/src/zh/UserGuide/Master/API/Programming-CSharp-Native-API.md
index ab1ebeb..b72300f 100644
--- a/src/zh/UserGuide/Master/API/Programming-CSharp-Native-API.md
+++ b/src/zh/UserGuide/Master/API/Programming-CSharp-Native-API.md
@@ -80,7 +80,7 @@ await
session_pool.InsertRecordAsync("root.test_group.test_device", rowRecord);
// 插入Tablet
var timestamp_lst = new List{ timestamp + 1 };
-var value_lst = new List {new() {"iotdb", true, (int) 12}};
+var value_lst = new List {"iotdb", true, (int) 12};
var tablet = new Tablet("root.test_group.test_device", measures, value_lst,
timestamp_ls);
await session_pool.InsertTabletAsync(tablet);
diff --git a/src/zh/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
b/src/zh/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
index ab1ebeb..b72300f 100644
--- a/src/zh/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
+++ b/src/zh/UserGuide/V1.2.x/API/Programming-CSharp-Native-API.md
@@ -80,7 +80,7 @@ await
session_pool.InsertRecordAsync("root.test_group.test_device", rowRecord);
// 插入Tablet
var timestamp_lst = new List{ timestamp + 1 };
-var value_lst = new List {new() {"iotdb", true, (int) 12}};
+var value_lst = new List {"iotdb", true, (int) 12};
var tablet = new Tablet("root.test_group.test_device", measures, value_lst,
timestamp_ls);
await session_pool.InsertTabletAsync(tablet);
(iotdb-docs) branch main updated: auth.add eng doc. (#113)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 9db5ffc auth.add eng doc. (#113) 9db5ffc is described below commit 9db5ffc09576369a1cc8e8e4e9111093c9625f1a Author: Colin Li <105656576+shuol...@users.noreply.github.com> AuthorDate: Thu Dec 7 11:46:45 2023 +0800 auth.add eng doc. (#113) --- .../Master/User-Manual/Authority-Management.md | 704 ++--- .../Master/User-Manual/Authority-Management.md | 150 +++-- 2 files changed, 459 insertions(+), 395 deletions(-) diff --git a/src/UserGuide/Master/User-Manual/Authority-Management.md b/src/UserGuide/Master/User-Manual/Authority-Management.md index 15c0447..1c46894 100644 --- a/src/UserGuide/Master/User-Manual/Authority-Management.md +++ b/src/UserGuide/Master/User-Manual/Authority-Management.md @@ -21,509 +21,499 @@ # Administration Management -IoTDB provides users with account privilege management operations, so as to ensure data security. +IoTDB provides permission management operations, offering users the ability to manage permissions for data and cluster systems, ensuring data and system security. -We will show you basic user privilege management operations through the following specific examples. Detailed SQL syntax and usage details can be found in [SQL Documentation](../Reference/SQL-Reference.md). -At the same time, in the JAVA programming environment, you can use the [Java JDBC](../API/Programming-JDBC.md) to execute privilege management statements in a single or batch mode. +This article introduces the basic concepts of the permission module in IoTDB, including user definition, permission management, authentication logic, and use cases. In the JAVA programming environment, you can use the [JDBC API](https://chat.openai.com/API/Programming-JDBC.md) to execute permission management statements individually or in batches. ## Basic Concepts ### User -The user is the legal user of the database. A user corresponds to a unique username and has a password as a means of authentication. Before using a database, a person must first provide a legitimate username and password to make himself/herself a user. +A user is a legitimate user of the database. Each user corresponds to a unique username and has a password as a means of authentication. Before using the database, a person must provide a valid (i.e., stored in the database) username and password for a successful login. -### Privilege +### Permission -The database provides a variety of operations, and not all users can perform all operations. If a user can perform an operation, the user is said to have the privilege to perform the operation. privileges are divided into data management privilege (such as adding, deleting and modifying data) and authority management privilege (such as creation and deletion of users and roles, granting and revoking of privileges, etc.). Data management privilege often needs a path to limit its effective [...] +The database provides various operations, but not all users can perform all operations. If a user can perform a certain operation, they are said to have permission to execute that operation. Permissions are typically limited in scope by a path, and [path patterns](https://chat.openai.com/Basic-Concept/Data-Model-and-Terminology.md) can be used to manage permissions flexibly. ### Role -A role is a set of privileges and has a unique role name as an identifier. A user usually corresponds to a real identity (such as a traffic dispatcher), while a real identity may correspond to multiple users. These users with the same real identity tend to have the same privileges. Roles are abstractions that can unify the management of such privileges. +A role is a collection of multiple permissions and has a unique role name as an identifier. Roles often correspond to real-world identities (e.g., a traffic dispatcher), and a real-world identity may correspond to multiple users. Users with the same real-world identity often have the same permissions, and roles are abstractions for unified management of such permissions. -### Default User +### Default Users and Roles -There is a default user in IoTDB after the initial installation: root, and the default password is root. This user is an administrator user, who cannot be deleted and has all the privileges. Neither can new privileges be granted to the root user nor can privileges owned by the root user be deleted. +After installation and initialization, IoTDB includes a default user: root, with the default password root. This user is an administrator with fixed permissions, which cannot be granted or revoked and cannot be deleted. There is only one administrator user in the database. -## Privilege Management Operation Examples +A
(iotdb-docs) branch main updated: IoTDB SSL parameter configuration (#117)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new c300e18 IoTDB SSL parameter configuration (#117)
c300e18 is described below
commit c300e185b95cef76ff82ec8b5aa97c34b91e12a8
Author: CloudWise-Lukemiao
<76942485+cloudwise-lukem...@users.noreply.github.com>
AuthorDate: Thu Nov 16 16:29:48 2023 +0800
IoTDB SSL parameter configuration (#117)
---
.../Master/Reference/DataNode-Config-Manual.md | 29
.../Master/Reference/DataNode-Config-Manual.md | 31 ++
2 files changed, 60 insertions(+)
diff --git a/src/UserGuide/Master/Reference/DataNode-Config-Manual.md
b/src/UserGuide/Master/Reference/DataNode-Config-Manual.md
index 572deb2..9a016bb 100644
--- a/src/UserGuide/Master/Reference/DataNode-Config-Manual.md
+++ b/src/UserGuide/Master/Reference/DataNode-Config-Manual.md
@@ -178,6 +178,35 @@ The permission definitions are in
${IOTDB\_CONF}/conf/jmx.access.
|Default| 5000
|
|Effective| After restarting system
|
+### SSL Configuration
+
+* enable\_thrift\_ssl
+
+|Name| enable\_thrift\_ssl|
+|:---:|:---|
+|Description|When enable\_thrift\_ssl is configured as true, SSL encryption
will be used for communication through dn\_rpc\_port |
+|Type| Boolean|
+|Default| false |
+|Effective| After restarting system|
+
+* key\_store\_path
+
+|Name| key\_store\_path |
+|:---:|:-|
+|Description| SSL certificate path |
+|Type| String |
+|Default| ""|
+|Effective| After restarting system |
+
+* key\_store\_pwd
+
+|Name| key\_store\_pwd |
+|:---:|:|
+|Description| SSL certificate password |
+|Type| String |
+|Default| "" |
+|Effective| After restarting system|
+
### Target Config Nodes
* dn\_target\_config\_node\_list
diff --git a/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md
b/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md
index e09161e..47b8659 100644
--- a/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md
+++ b/src/zh/UserGuide/Master/Reference/DataNode-Config-Manual.md
@@ -161,6 +161,37 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB
|默认值| 5000 |
|改后生效方式| 重启服务生效 |
+
+### SSL 配置
+
+* enable\_thrift\_ssl
+
+|名字| |
+|:---:|:--|
+|描述| 当enable\_thrift\_ssl配置为true时，将通过dn\_rpc\_port使用 SSL 加密进行通信 |
+|类型| Boolean |
+|默认值| false |
+|改后生效方式| 重启服务生效|
+
+* key\_store\_path
+
+|名字| key\_store\_path |
+|:---:|:-|
+|描述| ssl证书路径 |
+|类型| String |
+|默认值| ""|
+|改后生效方式| 重启服务生效 |
+
+* key\_store\_pwd
+
+|名字| key\_store\_pwd |
+|:---:|:|
+|描述| ssl证书密码 |
+|类型| String |
+|默认值| "" |
+|改后生效方式| 重启服务生效 |
+
+
### 目标 Config Nodes 配置
* dn\_target\_config\_node\_list
(iotdb-docs) branch main updated: [8443] fix the pathname erro in doc (#121)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 9ae0206 [8443] fix the pathname erro in doc (#121) 9ae0206 is described below commit 9ae0206298fae6bfac0a11b22af738899fd4b623 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Nov 16 16:20:08 2023 +0800 [8443] fix the pathname erro in doc (#121) --- src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md| 2 ++ src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md b/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md index a49d4b2..684f6b6 100644 --- a/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md @@ -55,6 +55,8 @@ After a database is set, the ancestral layers, children and descendant layers of The Layer Name of database can only consist of characters, numbers, and underscores, like `root.storagegroup_1`. +> Note ：Database name do not support enclosing * in back quotes, e.g., root.\ ` * \ `, but the rest of the level is free of this restriction. + ### Path A `path` is an expression that conforms to the following constraints: diff --git a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md index 8b6880b..f2823f3 100644 --- a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md +++ b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md @@ -49,6 +49,8 @@ IoTDB 模型结构涉及的基本概念在下文将做详细叙述。 Database 节点名只支持中英文字符、数字和下划线的组合。例如`root.数据库_1` 。 +> 注意 ：Database 节点名不支持将*用反引号括起来，如root.\` * \`,其余层级则无此限制。 + ## 设备（Device） **一个物理设备**，也称实体（Entity），是在实际场景中拥有物理量的设备或装置。在 IoTDB 当中，所有的物理量都有其对应的归属实体。实体是管理的一组时间序列的组合，可以是一个物理设备、测量装置、传感器集合等。
(iotdb-docs) branch main updated: update the doc of data sync (#116)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new bfbf784 update the doc of data sync (#116) bfbf784 is described below commit bfbf78416a1b7d126dcf72cab7b92f281f30734c Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Nov 16 16:19:40 2023 +0800 update the doc of data sync (#116) --- .../V1.2.x/User-Manual/Data-Sync_timecho.md| 593 - ...-Sync_timecho.md => Stage_Data-Sync_timecho.md} | 0 2 files changed, 223 insertions(+), 370 deletions(-) diff --git a/src/zh/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md b/src/zh/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md index 4799744..7acf914 100644 --- a/src/zh/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md +++ b/src/zh/UserGuide/V1.2.x/User-Manual/Data-Sync_timecho.md @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -19,451 +19,283 @@ --> -# IoTDB 数据同步 +# 数据同步 +数据同步是工业物联网的典型需求，通过数据同步机制，可实现IoTDB之间的数据共享，搭建完整的数据链路来满足内网外网数据互通、端边云同步、数据迁移、数据备份等需求。 -**IoTDB 数据同步功能可以将 IoTDB 的数据传输到另一个数据平台，我们将一个数据同步任务称为 Pipe。** +## 功能介绍 -**一个 Pipe 包含三个子任务（插件）：** +### 同步任务概述 -- 抽取（Extract） -- 处理（Process） -- 发送（Connect） +一个数据同步任务包含2个阶段： -**Pipe 允许用户自定义三个子任务的处理逻辑，通过类似 UDF 的方式处理数据。** 在一个 Pipe 中，上述的子任务分别由三种插件执行实现，数据会依次经过这三个插件进行处理：Pipe Extractor 用于抽取数据，Pipe Processor 用于处理数据，Pipe Connector 用于发送数据，最终数据将被发至外部系统。 +- 抽取（Extract）阶段：该部分用于从源 IoTDB 抽取数据，在SQL语句中的 Extractor 部分定义 +- 发送（Connect）阶段：该部分用于向目标 IoTDB 发送数据，在SQL语句中的 Connector 部分定义 -**Pipe 任务的模型如下：** - -描述一个数据同步任务，本质就是描述 Pipe Extractor、Pipe Processor 和 Pipe Connector 插件的属性。用户可以通过 SQL 语句声明式地配置三个子任务的具体属性，通过组合不同的属性，实现灵活的数据 ETL 能力。 +通过 SQL 语句声明式地配置2个部分的具体内容，可实现灵活的数据同步能力。 -利用数据同步功能，可以搭建完整的数据链路来满足端*边云同步、异地灾备、读写负载分库*等需求。 +### 同步任务 - 创建 -## 快速开始 +使用 `CREATE PIPE` 语句来创建一条数据同步任务，下列属性中`PipeId`和`connector`为必填项，`extractor`和`processor`为选填项，输入SQL时注意 `EXTRACTOR `与 `CONNECTOR` 插件顺序不能替换。 -** 目标：实现 IoTDB A -> IoTDB B 的全量数据同步** +SQL 示例如下： -- 启动两个 IoTDB，A（datanode -> 127.0.0.1:6667） B（datanode -> 127.0.0.1:6668） -- 创建 A -> B 的 Pipe，在 A 上执行 - - ```sql - create pipe a2b - with connector ( -'connector'='iotdb-thrift-connector', -'connector.ip'='127.0.0.1', -'connector.port'='6668' - ) - ``` -- 启动 A -> B 的 Pipe，在 A 上执行 - - ```sql - start pipe a2b - ``` -- 向 A 写入数据 - - ```sql - INSERT INTO root.db.d(time, m) values (1, 1) - ``` -- 在 B 检查由 A 同步过来的数据 - - ```sql - SELECT ** FROM root - ``` - -> ❗️**注：目前的 IoTDB -> IoTDB 的数据同步实现并不支持 DDL 同步** -> -> 即：不支持 ttl，trigger，别名，模板，视图，创建/删除序列，创建/删除存储组等操作 -> -> **IoTDB -> IoTDB 的数据同步要求目标端 IoTDB：** -> -> * 开启自动创建元数据：需要人工配置数据类型的编码和压缩与发送端保持一致 -> * 不开启自动创建元数据：手工创建与源端一致的元数据 - -## 同步任务管理 - -### 创建同步任务 - -可以使用 `CREATE PIPE` 语句来创建一条数据同步任务，示例 SQL 语句如下所示： - -```sql -CREATE PIPE -- PipeId 是能够唯一标定同步任务任务的名字 -WITH EXTRACTOR ( - -- 默认的 IoTDB 数据抽取插件 - 'extractor'= 'iotdb-extractor', - -- 路径前缀，只有能够匹配该路径前缀的数据才会被抽取，用作后续的处理和发送 - 'extractor.pattern'= 'root.timecho', - -- 是否抽取历史数据 - 'extractor.history.enable' = 'true', - -- 描述被抽取的历史数据的时间范围，表示最早时间 - 'extractor.history.start-time' = '2011.12.03T10:15:30+01:00', - -- 描述被抽取的历史数据的时间范围，表示最晚时间 - 'extractor.history.end-time' = '2022.12.03T10:15:30+01:00', - -- 是否抽取实时数据 - 'extractor.realtime.enable'= 'true', - -- 描述实时数据的抽取方式 - 'extractor.realtime.mode' = 'hybrid', -) -WITH PROCESSOR ( - -- 默认的数据处理插件，即不做任何处理 - 'processor'= 'do-nothing-processor', -) -WITH CONNECTOR ( - -- IoTDB 数据发送插件，目标端为 IoTDB - 'connector'= 'iotdb-thrift-connector', - -- 目标端 IoTDB 其中一个 DataNode 节点的数据服务 ip - 'connector.ip' = '127.0.0.1', - -- 目标端 IoTDB 其中一个 DataNode 节点的数据服务 port - 'connector.port' = '6667', -) -``` - -**创建同步任务时需要配置 PipeId 以及三个插件部分的参数：** - - -| 配置项| 说明 | 是否必填 | 默认实现 | 默认实现说明 | 是否允许自定义实现| -| - | - | --- | | -- | -
(iotdb-docs) branch main updated: docs(env):change docs about memory (#118)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new b8bac5a docs(env):change docs about memory (#118)
b8bac5a is described below
commit b8bac5aebd0f3ac50b0c32fb6354b0e0f6e2107a
Author: CritasWang
AuthorDate: Tue Nov 7 16:06:16 2023 +0800
docs(env):change docs about memory (#118)
---
.../Master/FAQ/Frequently-asked-questions.md | 2 +-
.../Master/QuickStart/ClusterQuickStart.md | 2 +-
.../Master/Reference/ConfigNode-Config-Manual.md | 24 +++---
.../Master/Reference/DataNode-Config-Manual.md | 24 +++---
.../Master/FAQ/Frequently-asked-questions.md | 2 +-
.../Master/QuickStart/ClusterQuickStart.md | 2 +-
.../Master/Reference/ConfigNode-Config-Manual.md | 24 +++---
.../Master/Reference/DataNode-Config-Manual.md | 24 +++---
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/UserGuide/Master/FAQ/Frequently-asked-questions.md
b/src/UserGuide/Master/FAQ/Frequently-asked-questions.md
index 804ed0b..8503ffe 100644
--- a/src/UserGuide/Master/FAQ/Frequently-asked-questions.md
+++ b/src/UserGuide/Master/FAQ/Frequently-asked-questions.md
@@ -238,4 +238,4 @@ not affect normal operations. We will fix this message in
the incoming releases.
3. How to decrease the memory usage of ConfigNode/DataNode?
-- Adjust the MAX_HEAP_SIZE、MAX_DIRECT_MEMORY_SIZE options in
conf/confignode-env.sh and conf/datanode-env.sh.
+- Adjust the ON_HEAP_MEMORY、OFF_HEAP_MEMORY options in conf/confignode-env.sh
and conf/datanode-env.sh.
diff --git a/src/UserGuide/Master/QuickStart/ClusterQuickStart.md
b/src/UserGuide/Master/QuickStart/ClusterQuickStart.md
index 3403bd8..601ff2f 100644
--- a/src/UserGuide/Master/QuickStart/ClusterQuickStart.md
+++ b/src/UserGuide/Master/QuickStart/ClusterQuickStart.md
@@ -51,7 +51,7 @@ Port:
**illustration：**
- We could use IP address or hostname/domain to set up an IoTDB cluster, then
we would take IP address. If using hostname/domain, `/etc/hosts` must be set
well.
-- JVM memory configuration: `MAX_HEAP_SIZE` in `confignode-env.sh` and
`datanode-env.sh`, equal to or greater than 1G is recommended. It's enough for
ConfigNode taking 1~2G. The memory taking of DataNode is decided by the
inputing and querying data.
+- JVM memory configuration: `ON_HEAP_MEMORY` in `confignode-env.sh` and
`datanode-env.sh`, equal to or greater than 1G is recommended. It's enough for
ConfigNode taking 1~2G. The memory taking of DataNode is decided by the
inputing and querying data.
### 1.1 download
In every computer, [Download](https://iotdb.apache.org/Download/) the IoTDB
install package and extract it to working directory of `/data/iotdb`.
diff --git a/src/UserGuide/Master/Reference/ConfigNode-Config-Manual.md
b/src/UserGuide/Master/Reference/ConfigNode-Config-Manual.md
index 6150dfa..3be0e1a 100644
--- a/src/UserGuide/Master/Reference/ConfigNode-Config-Manual.md
+++ b/src/UserGuide/Master/Reference/ConfigNode-Config-Manual.md
@@ -33,31 +33,31 @@ The environment configuration file is mainly used to
configure the Java environm
The details of each parameter are as follows:
-* MAX\_HEAP\_SIZE
+* MEMORY\_SIZE
-|Name|MAX\_HEAP\_SIZE|
+|Name|MEMORY\_SIZE|
|:---:|:---|
-|Description|The maximum heap memory size that IoTDB can use |
+|Description|The memory size that IoTDB ConfigNode will use when startup |
|Type|String|
-|Default| On Linux or MacOS, the default is one quarter of the memory. On
Windows, the default value for 32-bit systems is 512M, and the default for
64-bit systems is 2G.|
+|Default|The default is three-tenths of the memory, with a maximum of 16G.|
|Effective|After restarting system|
-* HEAP\_NEWSIZE
+* ON\_HEAP\_MEMORY
-|Name|HEAP\_NEWSIZE|
+|Name|ON\_HEAP\_MEMORY|
|:---:|:---|
-|Description|The minimum heap memory size that IoTDB will use when startup |
+|Description|The heap memory size that IoTDB ConfigNode can use, Former Name:
MAX\_HEAP\_SIZE |
|Type|String|
-|Default| On Linux or MacOS, the default is min{cores * 100M, one quarter of
MAX\_HEAP\_SIZE}. On Windows, the default value for 32-bit systems is 512M, and
the default for 64-bit systems is 2G.|
+|Default| Calculate based on MEMORY\_SIZE.|
|Effective|After restarting system|
-* MAX\_DIRECT\_MEMORY\_SIZE
+* OFF\_HEAP\_MEMORY
-|Name|MAX\_DIRECT\_MEMORY\_SIZE|
+|Name|OFF\_HEAP\_MEMORY|
|:---:|:---|
-|Description|The max direct memory that IoTDB could use|
+|Description|The direct memory that IoTDB ConfigNode can use, Former Name:
MAX\_DIRECT\_MEMORY\_SIZE |
|Type|String|
-|Default| Equal to the MAX\_HEAP\_SIZE|
+|Default| Calculate based on MEMORY\_SIZE.|
|Effective|After restarting system|
diff --git a/src/UserGuide/Master/Reference/DataNode-Config-Manual.md
(iotdb-docs) branch main updated: Update SQL-Manual.md (#120)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 52f17ca Update SQL-Manual.md (#120) 52f17ca is described below commit 52f17ca215a2ff1d810489695636ee253093e877 Author: Itami Sho <42286868+mini...@users.noreply.github.com> AuthorDate: Tue Nov 7 16:05:06 2023 +0800 Update SQL-Manual.md (#120) --- src/Download/README.md| 2 +- .../Master/Deployment-and-Maintenance/Security-Management.md | 4 ++-- .../Master/Deployment-and-Maintenance/Security-Management_timecho.md | 4 ++-- src/UserGuide/Master/SQL-Manual/SQL-Manual.md | 4 ++-- src/UserGuide/Master/User-Manual/Authority-Management.md | 4 ++-- .../Master/stage/Administration-Management/Administration.md | 4 ++-- src/UserGuide/Master/stage/SQL-Reference.md | 2 +- src/UserGuide/V0.13.x/Maintenance-Tools/Maintenance-Command.md| 2 +- src/UserGuide/V0.13.x/Reference/SQL-Reference.md | 2 +- src/UserGuide/V1.0.x/Administration-Management/Administration.md | 4 ++-- src/UserGuide/V1.0.x/Reference/SQL-Reference.md | 2 +- src/UserGuide/V1.1.x/Administration-Management/Administration.md | 4 ++-- src/UserGuide/V1.1.x/Reference/SQL-Reference.md | 2 +- src/UserGuide/V1.2.x/SQL-Manual/SQL-Manual.md | 4 ++-- src/UserGuide/V1.2.x/User-Manual/Authority-Management.md | 4 ++-- .../V1.2.x/stage/Administration-Management/Administration.md | 4 ++-- src/UserGuide/V1.2.x/stage/SQL-Reference.md | 2 +- src/zh/UserGuide/Master/SQL-Manual/SQL-Manual.md | 4 ++-- src/zh/UserGuide/Master/User-Manual/Security-Management.md| 4 ++-- src/zh/UserGuide/Master/User-Manual/Security-Management_timecho.md| 4 ++-- .../Master/stage/Administration-Management/Administration.md | 4 ++-- src/zh/UserGuide/V0.13.x/Maintenance-Tools/Maintenance-Command.md | 2 +- src/zh/UserGuide/V1.0.x/Administration-Management/Administration.md | 4 ++-- src/zh/UserGuide/V1.1.x/Administration-Management/Administration.md | 4 ++-- src/zh/UserGuide/V1.2.x/SQL-Manual/SQL-Manual.md | 4 ++-- src/zh/UserGuide/V1.2.x/User-Manual/Authority-Management.md | 4 ++-- .../V1.2.x/stage/Administration-Management/Administration.md | 4 ++-- 27 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Download/README.md b/src/Download/README.md index b45d79a..1a31838 100644 --- a/src/Download/README.md +++ b/src/Download/README.md @@ -234,7 +234,7 @@ Query the data of root.sg.a, you can see that the string is unescaped: * The data format (i.e., TsFile data) of v0.12.x and v0.13.x are compatible, but the WAL file is incompatible. So, you can follow the steps: - * ** Execute `SET STSTEM TO READONLY` command in CLI. ** + * ** Execute `SET SYSTEM TO READONLY` command in CLI. ** * ** Stop writing new data.** * Execute `flush` command to close all TsFiles. * We recommend to back up all data files before upgrading for rolling back. diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management.md b/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management.md index f5df881..bdb3d4b 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management.md @@ -497,10 +497,10 @@ Eg: IoTDB > FULL MERGE Eg: IoTDB > CLEAR CACHE ``` -- SET STSTEM TO READONLY / WRITABLE +- SET SYSTEM TO READONLY / WRITABLE ``` -Eg: IoTDB > SET STSTEM TO READONLY / WRITABLE +Eg: IoTDB > SET SYSTEM TO READONLY / WRITABLE ``` - Query abort diff --git a/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management_timecho.md b/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management_timecho.md index 39cc43e..9bb3593 100644 --- a/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management_timecho.md +++ b/src/UserGuide/Master/Deployment-and-Maintenance/Security-Management_timecho.md @@ -505,10 +505,10 @@ Eg: IoTDB > FULL MERGE Eg: IoTDB > CLEAR CACHE ``` -- SET STSTEM TO READONLY / WRITABLE +- SET SYSTEM TO READONLY / WRITABLE ``` -Eg: IoTDB > SET STSTEM TO READONLY / WRITABLE +Eg: IoTDB > SET SYSTEM TO READONLY / WRITABLE ``` - Query abort diff --git a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md index e6f62f5..9e1fc2f 100644 --- a/src/UserGuide/Master/SQL-Manual/SQL-Manual.md +++ b/src/UserGuide/Master/SQL-Manual/SQL-Manual.md @@ -1839,10 +1839,10 @@ Eg: IoTDB > FULL MERGE Eg: IoTDB &
(iotdb-docs) branch main updated: fix restApi insertRecords interface param inaccuracy(#119)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 5874e43 fix restApi insertRecords interface param inaccuracy(#119) 5874e43 is described below commit 5874e432717ea8afe61c5c6f51cad471a36fb6dd Author: Zhijia Cao AuthorDate: Fri Nov 3 17:36:42 2023 +0800 fix restApi insertRecords interface param inaccuracy(#119) --- src/zh/UserGuide/Master/API/RestServiceV2.md | 14 +++--- src/zh/UserGuide/V1.2.x/API/RestServiceV2.md | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/zh/UserGuide/Master/API/RestServiceV2.md b/src/zh/UserGuide/Master/API/RestServiceV2.md index c52191a..062821c 100644 --- a/src/zh/UserGuide/Master/API/RestServiceV2.md +++ b/src/zh/UserGuide/Master/API/RestServiceV2.md @@ -867,13 +867,13 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X 参数说明: -| 参数名称 |参数类型 |是否必填|参数描述| -|| | | | -| timestamps | array | 是 | 时间列 | -| measurements | array | 是 | 测点名称 | -| data_types_list | array | 是 | 数据类型 | -| values_list| array | 是 | 值列，每一列中的值可以为 `null` | -| devices| string | 是 | 设备名称 | +| 参数名称 |参数类型 |是否必填|参数描述| +|---| | | | +| timestamps| array | 是 | 时间列 | +| measurements_list | array | 是 | 测点名称 | +| data_types_list | array | 是 | 数据类型 | +| values_list | array | 是 | 值列，每一列中的值可以为 `null` | +| devices | string | 是 | 设备名称 | 请求示例： ```shell diff --git a/src/zh/UserGuide/V1.2.x/API/RestServiceV2.md b/src/zh/UserGuide/V1.2.x/API/RestServiceV2.md index c52191a..062821c 100644 --- a/src/zh/UserGuide/V1.2.x/API/RestServiceV2.md +++ b/src/zh/UserGuide/V1.2.x/API/RestServiceV2.md @@ -867,13 +867,13 @@ curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290" -X 参数说明: -| 参数名称 |参数类型 |是否必填|参数描述| -|| | | | -| timestamps | array | 是 | 时间列 | -| measurements | array | 是 | 测点名称 | -| data_types_list | array | 是 | 数据类型 | -| values_list| array | 是 | 值列，每一列中的值可以为 `null` | -| devices| string | 是 | 设备名称 | +| 参数名称 |参数类型 |是否必填|参数描述| +|---| | | | +| timestamps| array | 是 | 时间列 | +| measurements_list | array | 是 | 测点名称 | +| data_types_list | array | 是 | 数据类型 | +| values_list | array | 是 | 值列，每一列中的值可以为 `null` | +| devices | string | 是 | 设备名称 | 请求示例： ```shell
[iotdb-docs] branch main updated: fix wrong thing in Tiered Storage doc and delete the doc overlap in secuity management (#107)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new c6dc88c fix wrong thing in Tiered Storage doc and delete the doc
overlap in secuity management (#107)
c6dc88c is described below
commit c6dc88cb3fd8ae4b780b99be0543065c1a931044
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Wed Oct 25 18:37:38 2023 +0800
fix wrong thing in Tiered Storage doc and delete the doc overlap in
secuity management (#107)
---
src/.vuepress/sidebar/V1.2.x/en.ts | 1 -
src/.vuepress/sidebar/V1.2.x/zh.ts | 1 -
.../V1.2.x/User-Manual/Security-Management.md | 524
.../User-Manual/Security-Management_timecho.md | 501
.../V1.2.x/User-Manual/Tiered-Storage_timecho.md | 16 +-
.../V1.1.x/IoTDB-Introduction/Features.md | 6 +-
.../V1.2.x/IoTDB-Introduction/Features.md | 6 +-
.../V1.2.x/User-Manual/Security-Management.md | 527 -
.../User-Manual/Security-Management_timecho.md | 504
9 files changed, 16 insertions(+), 2070 deletions(-)
diff --git a/src/.vuepress/sidebar/V1.2.x/en.ts
b/src/.vuepress/sidebar/V1.2.x/en.ts
index 12044e5..3c085b3 100644
--- a/src/.vuepress/sidebar/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar/V1.2.x/en.ts
@@ -88,7 +88,6 @@ export const enSidebar = {
{ text: 'Streaming', link: 'Streaming' },
{ text: 'Data Sync', link: 'Data-Sync' },
{ text: 'Database Programming', link: 'Database-Programming' },
-{ text: 'Security Management', link: 'Security-Management' },
{ text: 'Authority Management', link: 'Authority-Management' },
],
},
diff --git a/src/.vuepress/sidebar/V1.2.x/zh.ts
b/src/.vuepress/sidebar/V1.2.x/zh.ts
index 52d0af4..8c6d188 100644
--- a/src/.vuepress/sidebar/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.2.x/zh.ts
@@ -88,7 +88,6 @@ export const zhSidebar = {
{ text: '流处理', link: 'Streaming' },
{ text: '数据同步', link: 'Data-Sync' },
{ text: '数据库编程', link: 'Database-Programming' },
-{ text: '安全控制', link: 'Security-Management' },
{ text: '权限管理', link: 'Authority-Management' },
],
},
diff --git a/src/UserGuide/V1.2.x/User-Manual/Security-Management.md
b/src/UserGuide/V1.2.x/User-Manual/Security-Management.md
deleted file mode 100644
index 206086c..000
--- a/src/UserGuide/V1.2.x/User-Manual/Security-Management.md
+++ /dev/null
@@ -1,524 +0,0 @@
-
-
-# Security Management
-
-## Administration Management
-
-IoTDB provides users with account privilege management operations, so as to
ensure data security.
-
-We will show you basic user privilege management operations through the
following specific examples. Detailed SQL syntax and usage details can be found
in [SQL Documentation](../SQL-Manual/SQL-Manual.md).
-At the same time, in the JAVA programming environment, you can use the [Java
JDBC](../API/Programming-JDBC.md) to execute privilege management statements in
a single or batch mode.
-
-### Basic Concepts
-
- User
-
-The user is the legal user of the database. A user corresponds to a unique
username and has a password as a means of authentication. Before using a
database, a person must first provide a legitimate username and password to
make himself/herself a user.
-
- Privilege
-
-The database provides a variety of operations, and not all users can perform
all operations. If a user can perform an operation, the user is said to have
the privilege to perform the operation. privileges are divided into data
management privilege (such as adding, deleting and modifying data) and
authority management privilege (such as creation and deletion of users and
roles, granting and revoking of privileges, etc.). Data management privilege
often needs a path to limit its effective [...]
-
- Role
-
-A role is a set of privileges and has a unique role name as an identifier. A
user usually corresponds to a real identity (such as a traffic dispatcher),
while a real identity may correspond to multiple users. These users with the
same real identity tend to have the same privileges. Roles are abstractions
that can unify the management of such privileges.
-
- Default User
-
-There is a default user in IoTDB after the initial installation: root, and the
default password is root. This user is an administrator user, who cannot be
deleted and has all the privileges. Neither can new privileges be granted to
the root user nor can privileges owned by the root user be deleted.
-
-### Privilege Management Operation Examples
-
-According to the [sample
data](https://github.com/thulab/iotdb/files/4438687/OtherMaterial-Sample.Data.txt),
the sample data of IoTDB might belong to different
[iotdb-docs] branch main updated: feat(download):remove 1.1.2 download url (#105)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 9079cd0 feat(download):remove 1.1.2 download url (#105) 9079cd0 is described below commit 9079cd00a338e5498a2f7d75c430cc473e3d72e6 Author: CritasWang AuthorDate: Thu Oct 19 21:46:31 2023 -0500 feat(download):remove 1.1.2 download url (#105) --- src/Download/README.md| 15 --- src/zh/Download/README.md | 15 --- src/zh/UserGuide/Master/User-Manual/IoTDB-View_timecho.md | 2 +- src/zh/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md | 2 +- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/Download/README.md b/src/Download/README.md index ca95d6b..b45d79a 100644 --- a/src/Download/README.md +++ b/src/Download/README.md @@ -47,21 +47,6 @@ https://www.apache.org/dyn/closer.cgi/iotdb/1.2.2/apache-iotdb-1.2.2-grafana-plugin-bin.zip;>Grafana-plugin https://www.apache.org/dyn/closer.cgi/iotdb/1.2.2/apache-iotdb-1.2.2-grafana-plugin-bin.zip.sha512;>SHA512 https://www.apache.org/dyn/closer.cgi/1.2.2/apache-iotdb-1.2.2-grafana-plugin-bin.zip.asc;>ASC - - - 1.1.2 - https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip;>All-in-one - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip.sha512;>SHA512 - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip.asc;>ASC - https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip;>Sources - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip.sha512;>SHA512 - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip.asc;>ASC - https://dlcdn.apache.org/iotdb/1.1.2/RELEASE_NOTES.md;>release notes - - - https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip;>Grafana-plugin - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip.sha512;>SHA512 - https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip.asc;>ASC 0.13.4 diff --git a/src/zh/Download/README.md b/src/zh/Download/README.md index ef9f741..206a70c 100644 --- a/src/zh/Download/README.md +++ b/src/zh/Download/README.md @@ -47,21 +47,6 @@ https://www.apache.org/dyn/closer.cgi/iotdb/1.2.2/apache-iotdb-1.2.2-grafana-plugin-bin.zip.sha512;>SHA512 https://www.apache.org/dyn/closer.cgi/1.2.2/apache-iotdb-1.2.2-grafana-plugin-bin.zip.asc;>ASC - -1.1.2 -https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip;>All-in-one -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip.sha512;>SHA512 -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-all-bin.zip.asc;>ASC -https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip;>源代码 -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip.sha512;>SHA512 -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-source-release.zip.asc;>ASC -https://dlcdn.apache.org/iotdb/1.1.2/RELEASE_NOTES.md;>release notes - - -https://www.apache.org/dyn/closer.cgi/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip;>Grafana 插件 -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip.sha512;>SHA512 -https://downloads.apache.org/iotdb/1.1.2/apache-iotdb-1.1.2-grafana-plugin-bin.zip.asc;>ASC - 0.13.4 https://dlcdn.apache.org/iotdb/0.13.4/apache-iotdb-0.13.4-all-bin.zip;>All-in-one diff --git a/src/zh/UserGuide/Master/User-Manual/IoTDB-View_timecho.md b/src/zh/UserGuide/Master/User-Manual/IoTDB-View_timecho.md index 29b74ab..62904c4 100644 --- a/src/zh/UserGuide/Master/User-Manual/IoTDB-View_timecho.md +++ b/src/zh/UserGuide/Master/User-Manual/IoTDB-View_timecho.md @@ -63,7 +63,7 @@ 序列视图是一种组织管理时间序列的方式。 -在传统关系型数据库中，数据都必须存放在一个表中，而在IoTDB等时序时序数据库中，序列才是存储单元。因此，IoTDB中序列视图的概念也是建立在序列上的。 +在传统关系型数据库中，数据都必须存放在一个表中，而在IoTDB等时序数据库中，序列才是存储单元。因此，IoTDB中序列视图的概念也是建立在序列上的。 一个序列视图就是一条虚拟的时间序列，每条虚拟的时间序列都像是一条软链接或快捷方式，映射到某个视图外部的序列或者某种计算逻辑。换言之，一个虚拟序列要么映射到某个确定的外部序列，要么由多个外部序列运算得来。 diff --git a/src/zh/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md b/src/zh/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md index 8330a80..59e2dd2 100644 --- a/src/zh/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md +++ b/src/zh/UserGuid
[iotdb-docs] branch main updated: fix title bug and add English doc (#100)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 092d86a fix title bug and add English doc (#100) 092d86a is described below commit 092d86a7d73c6c544141e4fa090d321bf0828a81 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Tue Oct 17 20:39:37 2023 +0800 fix title bug and add English doc (#100) --- .../V1.2.x/IoTDB-Introduction/Publication.md | 8 +-- .../V1.2.x/User-Manual/IoTDB-Data-Pipe_timecho.md | 24 --- .../V1.2.x/User-Manual/IoTDB-View_timecho.md | 2 +- .../User-Manual/Security-Management_timecho.md | 4 +- .../V1.2.x/User-Manual/Tiered-Storage_timecho.md | 76 +- .../Environmental-Requirement.md | 2 +- .../V1.2.x/IoTDB-Introduction/Publication.md | 9 +-- .../UserGuide/V1.2.x/Tools-System/Monitor-Tool.md | 22 +++ .../V1.2.x/User-Manual/Database-Programming.md | 2 +- .../V1.2.x/User-Manual/Write-Delete-Data.md| 2 +- 10 files changed, 94 insertions(+), 57 deletions(-) diff --git a/src/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md b/src/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md index db23cdb..94413e4 100644 --- a/src/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md +++ b/src/UserGuide/V1.2.x/IoTDB-Introduction/Publication.md @@ -19,9 +19,7 @@ --> -# Publication - -## Research Papers +# Research Papers Apache IoTDB starts at Tsinghua University, School of Software. IoTDB is a database for managing large amount of time series data with columnar storage, data encoding, pre-computation, and index techniques. It has SQL-like interface to write millions of data points per second per node and is optimized to get query results in few seconds over trillions of data points. It can also be easily integrated with Apache Hadoop MapReduce and Apache Spark for analytics. @@ -35,8 +33,4 @@ The research papers related are as follows: * [The Design of Apache IoTDB distributed framework](http://ndbc2019.sdu.edu.cn/info/1002/1044.htm), Tianan Li, Jianmin Wang, Xiangdong Huang, Yi Xu, Dongfang Mao, Jun Yuan. NDBC 2019 * [Dual-PISA: An index for aggregation operations on time series data](https://www.sciencedirect.com/science/article/pii/S0306437918305489), Jialin Qiao, Xiangdong Huang, Jianmin Wang, Raymond K Wong. IS 2020 -## Benchmark tools - -We also developed Benchmark tools for time series databases -[https://github.com/thulab/iot-benchmark](https://github.com/thulab/iot-benchmark) diff --git a/src/UserGuide/V1.2.x/User-Manual/IoTDB-Data-Pipe_timecho.md b/src/UserGuide/V1.2.x/User-Manual/IoTDB-Data-Pipe_timecho.md deleted file mode 100644 index f4f038a..000 --- a/src/UserGuide/V1.2.x/User-Manual/IoTDB-Data-Pipe_timecho.md +++ /dev/null @@ -1,24 +0,0 @@ - - -# IoTDB Data Pipe - -TODO \ No newline at end of file diff --git a/src/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md b/src/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md index a9ea5a7..20d3a9d 100644 --- a/src/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md +++ b/src/UserGuide/V1.2.x/User-Manual/IoTDB-View_timecho.md @@ -21,4 +21,4 @@ # IoTDB View -TODO \ No newline at end of file +coming soon \ No newline at end of file diff --git a/src/UserGuide/V1.2.x/User-Manual/Security-Management_timecho.md b/src/UserGuide/V1.2.x/User-Manual/Security-Management_timecho.md index 021baac..222820b 100644 --- a/src/UserGuide/V1.2.x/User-Manual/Security-Management_timecho.md +++ b/src/UserGuide/V1.2.x/User-Manual/Security-Management_timecho.md @@ -23,11 +23,11 @@ ## White List -TODO +coming soon ## Audit Log -TODO +coming soon ## Administration Management diff --git a/src/UserGuide/V1.2.x/User-Manual/Tiered-Storage_timecho.md b/src/UserGuide/V1.2.x/User-Manual/Tiered-Storage_timecho.md index c5ac54a..23ea05e 100644 --- a/src/UserGuide/V1.2.x/User-Manual/Tiered-Storage_timecho.md +++ b/src/UserGuide/V1.2.x/User-Manual/Tiered-Storage_timecho.md @@ -19,6 +19,78 @@ --> -# Tiered Storage +# Tiered Storage +## Overview -TODO \ No newline at end of file +Tiered storage function provides users with the ability to manage tiered storage media. users can use the tiered storage function to configure different types of storage media for IoTDB and to classify the storage media. ioTDB can support tiered storage from memory, SSD, normal hard disc to network hard disc by parameter configuration only according to the degree of hot and cold data. Specifically, in IoTDB, the configuration of tiered storage is reflected in the management of multiple d [...] + +## Parameter Definition + +To enable tiered storage in IoTDB, you need to configure the following aspects: + +1. configure the data catalogue and divide the data catalogue into different tiers +2. confi
[iotdb-docs] branch main updated: fix the url that can`t be detected by tools (#98)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 7772212 fix the url that can`t be detected by tools (#98) 7772212 is described below commit 7772212ac78f4dd1c7f2a31d55db03a8aac8d947 Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Tue Sep 26 21:54:04 2023 +0800 fix the url that can`t be detected by tools (#98) --- .../Deployment-and-Maintenance/Deployment-Guide.md | 18 ++-- .../Deployment-Guide_timecho.md| 16 +- .../V1.2.x/Ecosystem-Integration/Grafana-Plugin.md | 4 +-- src/UserGuide/V1.2.x/Tools-System/Benchmark.md | 34 +++--- .../Deployment-and-Maintenance/Deployment-Guide.md | 16 +- .../Deployment-Guide_timecho.md| 16 +- .../V1.2.x/Ecosystem-Integration/Grafana-Plugin.md | 4 +-- src/zh/UserGuide/V1.2.x/Tools-System/Benchmark.md | 30 +-- .../V1.2.x/User-Manual/IoTDB-View_timecho.md | 2 +- src/zh/UserGuide/V1.2.x/User-Manual/Query-Data.md | 2 +- src/zh/UserGuide/V1.2.x/User-Manual/Syntax-Rule.md | 2 +- 11 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Guide.md b/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Guide.md index 2bd1849..05f76c0 100644 --- a/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Guide.md +++ b/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Guide.md @@ -107,7 +107,7 @@ the default number of replicas is one. ./cluster0/sbin/start-cli.sh ``` -+ Execute the [show cluster details](https://iotdb.apache.org/UserGuide/Master/Maintenance-Tools/Maintenance-Command.html#show-all-node-information) ++ Execute the `show cluster details` command on the Cli. The result is shown below: ``` @@ -320,7 +320,7 @@ Please deploy the files to all servers of your target cluster. A best practice is deploying the files into the same directory in all servers. If you want to try the cluster mode on one server, please read -[Cluster Quick Start](https://iotdb.apache.org/UserGuide/Master/QuickStart/ClusterQuickStart.html). +[Cluster Quick Start](../QuickStart/ClusterQuickStart.md). Cluster Configuration @@ -338,7 +338,7 @@ and DataNode configuration (see Chap 5.2.3). Open the common configuration file ./conf/iotdb-common.properties, and set the following parameters base on the -[Deployment Recommendation](https://iotdb.apache.org/UserGuide/Master/Cluster/Deployment-Recommendation.html): +[Deployment Recommendation](./Deployment-Recommendation.md): | **Configuration** | **Description** | **Default** | | -- | | --- | @@ -413,7 +413,7 @@ Before start the Seed-ConfigNode, please open the common configuration file ./co | data\_replication\_factor | Is set to the expected data replication count | | data\_region\_consensus\_protocol\_class | Is set to the expected consensus protocol | -**Notice:** Please set these parameters carefully based on the [Deployment Recommendation](https://iotdb.apache.org/UserGuide/Master/Cluster/Deployment-Recommendation.html). +**Notice:** Please set these parameters carefully based on the [Deployment Recommendation](./Deployment-Recommendation.md). These parameters are not modifiable after the Node first startup. Then open its configuration file ./conf/iotdb-confignode.properties and check the following parameters: @@ -439,7 +439,7 @@ nohup bash ./sbin/start-confignode.sh >/dev/null 2>&1 & ``` For more details about other configuration parameters of ConfigNode, see the -[ConfigNode Configurations](https://iotdb.apache.org/UserGuide/Master/Reference/ConfigNode-Config-Manual.html). +[ConfigNode Configurations](../Reference/ConfigNode-Config-Manual.md) . # Add more ConfigNodes (Optional) @@ -484,7 +484,7 @@ nohup bash ./sbin/start-confignode.sh >/dev/null 2>&1 & ``` For more details about other configuration parameters of ConfigNode, see the -[ConfigNode Configurations](https://iotdb.apache.org/UserGuide/Master/Reference/ConfigNode-Config-Manual.html). +[ConfigNode Configurations](../Reference/ConfigNode-Config-Manual.md) . # Start DataNode @@ -526,7 +526,7 @@ nohup bash ./sbin/start-datanode.sh >/dev/null 2>&1 & ``` For more details about other configuration parameters of DataNode, see the -[DataNode Configurations](https://iotdb.apache.org/UserGuide/Master/Reference/DataNode-Config-Manual.html). +[DataN
[iotdb] branch jira6156 deleted (was 55cad7b9116)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch jira6156 in repository https://gitbox.apache.org/repos/asf/iotdb.git was 55cad7b9116 fix The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch master updated: [To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in Thrift AsyncServer For IoTConsensus
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 ca7b9d0ff02 [To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in
Thrift AsyncServer For IoTConsensus
ca7b9d0ff02 is described below
commit ca7b9d0ff022f20fe06997c90ec91418ca09908d
Author: Potato
AuthorDate: Fri Sep 15 21:05:51 2023 +0800
[To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in Thrift
AsyncServer For IoTConsensus
---
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 25 ++
1 file changed, 25 insertions(+)
diff --git
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
index d6d8ef2cb69..c7aeef8ec36 100644
---
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
+++
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.rpc;
+import org.apache.thrift.transport.TMemoryInputTransport;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
@@ -46,9 +47,33 @@ public class RpcTransportFactory extends TTransportFactory {
@Override
public TTransport getTransport(TTransport trans) throws TTransportException {
+updateConfigurationForAsyncServerIfNecessary(trans);
return inner.getTransport(trans);
}
+ /**
+ * The Thrift AsyncServer uses TMemoryInputTransport (https://github.com/apache/thrift/blob/master/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java#L291;>...),
+ * which employs the default configuration and performs size checks during
the read and write
+ * processes. This behavior is not in line with our expectations of manually
adjusting certain
+ * parameters. Therefore, special handling is required for it in this
function.
+ *
+ * @param trans TTransport
+ */
+ private void updateConfigurationForAsyncServerIfNecessary(TTransport trans) {
+if (trans instanceof TMemoryInputTransport) {
+ trans
+ .getConfiguration()
+
.setRecursionLimit(TConfigurationConst.defaultTConfiguration.getRecursionLimit());
+ trans
+ .getConfiguration()
+
.setMaxMessageSize(TConfigurationConst.defaultTConfiguration.getMaxMessageSize());
+ trans
+ .getConfiguration()
+
.setMaxFrameSize(TConfigurationConst.defaultTConfiguration.getMaxFrameSize());
+}
+ }
+
public TTransport getTransportWithNoTimeout(String ip, int port) throws
TTransportException {
return inner.getTransport(new
TSocket(TConfigurationConst.defaultTConfiguration, ip, port));
}
[iotdb] branch jira6156_Cp deleted (was b4abe71d874)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch jira6156_Cp in repository https://gitbox.apache.org/repos/asf/iotdb.git was b4abe71d874 fix The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch rel/1.2 updated: [To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in Thrift AsyncServer For IoTConsensus
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 4e0a44e1739 [To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in
Thrift AsyncServer For IoTConsensus
4e0a44e1739 is described below
commit 4e0a44e173942186efeea4fa9a79c6ef2c988d22
Author: Potato
AuthorDate: Fri Sep 15 21:05:21 2023 +0800
[To rel/1.2][IOTDB-6156] Fixed TConfiguration invalidly in Thrift
AsyncServer For IoTConsensus
---
.../org/apache/iotdb/rpc/RpcTransportFactory.java | 25 ++
1 file changed, 25 insertions(+)
diff --git
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
index d6d8ef2cb69..c7aeef8ec36 100644
---
a/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
+++
b/iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcTransportFactory.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.rpc;
+import org.apache.thrift.transport.TMemoryInputTransport;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
@@ -46,9 +47,33 @@ public class RpcTransportFactory extends TTransportFactory {
@Override
public TTransport getTransport(TTransport trans) throws TTransportException {
+updateConfigurationForAsyncServerIfNecessary(trans);
return inner.getTransport(trans);
}
+ /**
+ * The Thrift AsyncServer uses TMemoryInputTransport (https://github.com/apache/thrift/blob/master/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java#L291;>...),
+ * which employs the default configuration and performs size checks during
the read and write
+ * processes. This behavior is not in line with our expectations of manually
adjusting certain
+ * parameters. Therefore, special handling is required for it in this
function.
+ *
+ * @param trans TTransport
+ */
+ private void updateConfigurationForAsyncServerIfNecessary(TTransport trans) {
+if (trans instanceof TMemoryInputTransport) {
+ trans
+ .getConfiguration()
+
.setRecursionLimit(TConfigurationConst.defaultTConfiguration.getRecursionLimit());
+ trans
+ .getConfiguration()
+
.setMaxMessageSize(TConfigurationConst.defaultTConfiguration.getMaxMessageSize());
+ trans
+ .getConfiguration()
+
.setMaxFrameSize(TConfigurationConst.defaultTConfiguration.getMaxFrameSize());
+}
+ }
+
public TTransport getTransportWithNoTimeout(String ip, int port) throws
TTransportException {
return inner.getTransport(new
TSocket(TConfigurationConst.defaultTConfiguration, ip, port));
}
[iotdb-docs] branch main updated: add missing file and fix bad url of V1.2 (#87)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 2613aa9 add missing file and fix bad url of V1.2 (#87)
2613aa9 is described below
commit 2613aa9ca49e5e2953ad010dd80282d12862c685
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Tue Sep 12 17:16:10 2023 +0800
add missing file and fix bad url of V1.2 (#87)
---
src/zh/UserGuide/V1.2.x/API/Programming-Java-Native-API.md | 2 +-
.../V1.2.x/Basic-Concept/Data-Model-and-Terminology.md | 4 ++--
src/zh/UserGuide/V1.2.x/Reference/UDF-Libraries.md | 4 ++--
src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md | 10 +-
src/zh/UserGuide/V1.2.x/User-Manual/Query-Data.md | 4 ++--
src/zh/UserGuide/V1.2.x/User-Manual/Security-Management.md | 2 +-
.../V1.2.x/User-Manual/Security-Management_timecho.md | 2 +-
src/zh/UserGuide/V1.2.x/{stage => User-Manual}/Syntax-Rule.md | 0
src/zh/UserGuide/V1.2.x/User-Manual/Write-Delete-Data.md | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/zh/UserGuide/V1.2.x/API/Programming-Java-Native-API.md
b/src/zh/UserGuide/V1.2.x/API/Programming-Java-Native-API.md
index 5ca9d88..7cb72e0 100644
--- a/src/zh/UserGuide/V1.2.x/API/Programming-Java-Native-API.md
+++ b/src/zh/UserGuide/V1.2.x/API/Programming-Java-Native-API.md
@@ -50,7 +50,7 @@ mvn clean install -pl iotdb-client/session -am
-Dmaven.test.skip=true
## 语法说明
- - 对于 IoTDB-SQL 接口：传入的 SQL 参数需要符合
[语法规范](../Syntax-Conventions/Literal-Values.md) ，并且针对 JAVA
字符串进行反转义，如双引号前需要加反斜杠。（即：经 JAVA 转义之后与命令行执行的 SQL 语句一致。）
+ - 对于 IoTDB-SQL 接口：传入的 SQL 参数需要符合 [语法规范](../User-Manual/Syntax-Rule.md#字面值常量)
，并且针对 JAVA 字符串进行反转义，如双引号前需要加反斜杠。（即：经 JAVA 转义之后与命令行执行的 SQL 语句一致。）
- 对于其他接口：
- 经参数传入的路径或路径前缀中的节点： 在 SQL 语句中需要使用反引号（`）进行转义的，此处均需要进行转义。
- 经参数传入的标识符（如模板名）：在 SQL 语句中需要使用反引号（`）进行转义的，均可以不用进行转义。
diff --git
a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md
b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md
index 279b1e1..8b6880b 100644
--- a/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md
+++ b/src/zh/UserGuide/V1.2.x/Basic-Concept/Data-Model-and-Terminology.md
@@ -27,7 +27,7 @@
https://alioss.timecho.com/docs/img/github/123542457-5f511d00-d77c-11eb-8006-562d83069baa.png;>
-在上图所描述的实际场景中，有许多实体所采集的物理量相同，即具有相同的工况名称和类型，因此，可以声明一个**元数据模板**来定义可采集的物理量集合。在实践中，元数据模板的使用可帮助减少元数据的资源占用，详细内容参见
[元数据模板文档](../User-Manual/Operate-Metadata.md#元数据模板管理)。
+在上图所描述的实际场景中，有许多实体所采集的物理量相同，即具有相同的工况名称和类型，因此，可以声明一个**元数据模板**来定义可采集的物理量集合。在实践中，元数据模板的使用可帮助减少元数据的资源占用，详细内容参见
[元数据模板](../User-Manual/Operate-Metadata.md#元数据模板管理)。
IoTDB 模型结构涉及的基本概念在下文将做详细叙述。
@@ -125,7 +125,7 @@ wildcard
* [ 0-9 a-z A-Z _ ] （字母，数字，下划线）
* ['\u2E80'..'\u9FFF'] （UNICODE 中文字符）
* 特别地，如果系统在 Windows 系统上部署，那么 database 路径结点名是大小写不敏感的。例如，同时创建`root.ln` 和
`root.LN` 是不被允许的。
-*
如果需要在路径结点名中用特殊字符，可以用反引号引用路径结点名，具体使用方法可以参考[语法约定](../Syntax-Conventions/Literal-Values.md)。
+*
如果需要在路径结点名中用特殊字符，可以用反引号引用路径结点名，具体使用方法可以参考[语法约定](../User-Manual/Syntax-Rule.md)。
## 路径模式（Path Pattern）
diff --git a/src/zh/UserGuide/V1.2.x/Reference/UDF-Libraries.md
b/src/zh/UserGuide/V1.2.x/Reference/UDF-Libraries.md
index 6ec19b2..52d625e 100644
--- a/src/zh/UserGuide/V1.2.x/Reference/UDF-Libraries.md
+++ b/src/zh/UserGuide/V1.2.x/Reference/UDF-Libraries.md
@@ -605,13 +605,13 @@ select Accuracy(t1,t2,t3,m1,m2,m3) from root.test
函数简介
-本函数用于计算时间序列的自相关函数值，即序列与自身之间的互相关函数，详情参见[XCorr](./Data-Matching.md#XCorr)函数文档。
+本函数用于计算时间序列的自相关函数值，即序列与自身之间的互相关函数，详情参见[XCorr](../Reference/UDF-Libraries.md#XCorr)函数文档。
**函数名：** ACF
**输入序列：** 仅支持单个输入序列，类型为 INT32 / INT64 / FLOAT / DOUBLE。
-**输出序列：** 输出单个序列，类型为
DOUBLE。序列中共包含$2N-1$个数据点，每个值的具体含义参见[XCorr](./Data-Matching.md#XCorr)函数文档。
+**输出序列：** 输出单个序列，类型为 DOUBLE。序列中共包含$2N-1$个数据点，每个值的具体含义参见[XCorr](#XCorr)函数文档。
**提示：**
diff --git a/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md
b/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md
index f74c52e..c018e0a 100644
--- a/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md
+++ b/src/zh/UserGuide/V1.2.x/Tools-System/Import-Export-Tool.md
@@ -42,7 +42,7 @@ TsFile 是在 IoTDB 中使用的时间序列的文件格式，您可以通过CLI
第一个参数表示待加载的 tsfile 文件的路径。load 命令有三个可选项，分别是 sglevel，值域为整数，verify，值域为
true/false，onSuccess，值域为delete/none。不同选项之间用空格隔开，选项之间无顺序要求。
-SGLEVEL 选项，当 tsfile 对应的 database 不存在时，用户可以通过 sglevel 参数的值来制定 database
的级别，默认为`iotdb-datanode.properties`中设置的级别。例如当设置 level 参数为1时表明此 tsfile
中所有时间序列中层级为1的前缀路径是 database，即若存在设备 root.sg.d1.s1，此时 root.sg 被指定为 database。
+SGLEVEL 选项，当 tsfile 对应的 database 不存在时，用户可以通过 sglevel 参数的值来制定 database
的级别，默认为`iotdb-datanode.properties`中设置的级别。例如当设置 level 参数为1时表明此 tsfile
中所有时间序列中层级为1的前缀路径是 database，即若存在设备 root.sg.d1.s1，此时 `r
[iotdb-docs] branch main updated: update Grafana-Plugin doc (#80)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new d085b80 update Grafana-Plugin doc (#80)
d085b80 is described below
commit d085b80b71a789792884ce9bb7c9b824bb78de7f
Author: CloudWise-Lukemiao
<76942485+cloudwise-lukem...@users.noreply.github.com>
AuthorDate: Tue Sep 12 10:02:58 2023 +0800
update Grafana-Plugin doc (#80)
Co-authored-by: Cloudwise_Luke <282583...@qq.com>
---
.../Master/Ecosystem-Integration/Grafana-Plugin.md | 70 ++
.../V1.1.x/Ecosystem-Integration/Grafana-Plugin.md | 102 +++--
.../V1.2.x/Ecosystem-Integration/Grafana-Plugin.md | 72 ++-
.../Master/Ecosystem-Integration/Grafana-Plugin.md | 88 +++---
.../V1.1.x/Ecosystem-Integration/Grafana-Plugin.md | 98 +++-
.../V1.2.x/Ecosystem-Integration/Grafana-Plugin.md | 88 +++---
6 files changed, 70 insertions(+), 448 deletions(-)
diff --git a/src/UserGuide/Master/Ecosystem-Integration/Grafana-Plugin.md
b/src/UserGuide/Master/Ecosystem-Integration/Grafana-Plugin.md
index dc1f6ad..ca9aec4 100644
--- a/src/UserGuide/Master/Ecosystem-Integration/Grafana-Plugin.md
+++ b/src/UserGuide/Master/Ecosystem-Integration/Grafana-Plugin.md
@@ -37,81 +37,29 @@ Compared with previous IoTDB-Grafana-Connector, current
Grafana-Plugin performs
### Acquisition method of grafana plugin
- Method 1: grafana plugin binary Download
+ Download apache-iotdb-datasource from Grafana's official website
-Download url：https://iotdb.apache.org/zh/Download/
+Download
url：https://grafana.com/api/plugins/apache-iotdb-datasource/versions/1.0.0/download
- Method 2: separate compilation of grafana plugin
-
-We need to compile the front-end project in the IoTDB `grafana-plugin`
directory and then generate the `dist` directory. The specific execution
process is as follows.
-
-Source download
-
-* Plugin name: grafana-plugin
-* Download url: https://github.com/apache/iotdb.git
-
-Execute the following command:
-
-```shell
-git clone https://github.com/apache/iotdb.git
-```
-
-* Option 1 (compile with maven): execute following command in the
`grafana-plugin` directory:
-
-```shell
-mvn install package -P compile-grafana-plugin
-```
-
-* Option 2 (compile with yarn): execute following command in the
`grafana-plugin` directory:
-
-```shell
-yarn install
-yarn build
-go get -u github.com/grafana/grafana-plugin-sdk-go
-go mod tidy
-mage -v
-```
-
-When using the go get -u command, the following error may be reported. In this
case, we need to execute `go env -w GOPROXY=https://goproxy.cn`, and then
execute `go get -u github.com/grafana/grafana -plugin-sdk-go`
-
-```
-go get: module github.com/grafana/grafana-plugin-sdk-go: Get
"https://proxy.golang.org/github.com/grafana/grafana-plugin-sdk-go/@v/list":
dial tcp 142.251.42.241:443: i/o timeout
-```
-
-If compiling successful, you can see the `dist` directory , which contains the
compiled Grafana-Plugin:
-
-https://alioss.timecho.com/docs/img/UserGuide/Ecosystem-Integration/Grafana-plugin/grafana-plugin-build.png?raw=true;>
-
- Method 3: The distribution package of IoTDB is fully compiled
+### Install Grafana-Plugin
-We can also obtain the front-end project of `grafana-plugin` and other IoTDB
executable files by executing the **package instruction** of the IoTDB project.
+### Method 1: Install using the grafana cli tool (recommended)
-Execute following command in the IoTDB root directory:
+* Use the grafana cli tool to install apache-iotdb-datasource from the command
line. The command content is as follows:
```shell
- mvn clean package -pl distribution -am -DskipTests -P compile-grafana-plugin
+grafana-cli plugins install apache-iotdb-datasource
```
-If compiling successful, you can see that the `distribution/target` directory
contains the compiled Grafana-Plugin:
+### Method 2: Install using the Grafana interface (recommended)
-https://alioss.timecho.com/docs/img/UserGuide/Ecosystem-Integration/Grafana-plugin/distribution.png?raw=true;>
+* Click on Configuration ->Plugins ->Search IoTDB from local Grafana to
install the plugin
+### Method 3: Manually install the grafana-plugin plug-in (not recommended)
-### Install Grafana-Plugin
* Copy the front-end project target folder generated above to Grafana's plugin
directory `${Grafana directory}\data\plugins\`。If there is no such directory,
you can manually create it or start grafana and it will be created
automatically. Of course, you can also modify the location of plugins. For
details, please refer to the following instructions for modifying the location
of Grafana's plugin directory.
-
-* Modify Grafana configuration file: the file is in（`${Grafana
directory}\conf\defaults.ini`）, and do the fo
[iotdb-docs] branch main updated: add resource recommend doc in sidebar Engilish (#89)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new f940e3c add resource recommend doc in sidebar Engilish (#89)
f940e3c is described below
commit f940e3ce6c4f4bd50f5e6ccc995199de58340339
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Fri Sep 8 14:35:09 2023 +0800
add resource recommend doc in sidebar Engilish (#89)
---
src/.vuepress/sidebar/V1.2.x/en.ts | 3 ++-
src/.vuepress/sidebar/V1.2.x/zh.ts | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/.vuepress/sidebar/V1.2.x/en.ts
b/src/.vuepress/sidebar/V1.2.x/en.ts
index cf830a7..8a9da1b 100644
--- a/src/.vuepress/sidebar/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar/V1.2.x/en.ts
@@ -67,9 +67,10 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'Environmental Requirement', link: 'Environmental-Requirement'
},
-{ text: 'Get Installation Package', link: 'Get-Installation-Package' },
+{ text: 'Resource Recommendation', link: 'Deployment-Recommendation' },
{ text: 'Deployment Guide', link: 'Deployment-Guide' },
{ text: 'Docker Install', link: 'Docker-Install' },
+{ text: 'Monitoring-Board-Install-and-Deploy', link:
'Monitoring-Board-Install-and-Deploy' },
],
},
diff --git a/src/.vuepress/sidebar/V1.2.x/zh.ts
b/src/.vuepress/sidebar/V1.2.x/zh.ts
index c3d0066..4012f47 100644
--- a/src/.vuepress/sidebar/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar/V1.2.x/zh.ts
@@ -67,6 +67,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: '环境要求', link: 'Environmental-Requirement' },
+{ text: '资源推荐', link: 'Deployment-Recommendation' },
{ text: '安装包获取', link: 'Get-Installation-Package' },
{ text: '部署指导', link: 'Deployment-Guide' },
{ text: 'docker部署', link: 'Docker-Install' },
[iotdb-docs] branch main updated: add doc Deployment-Recommendation and remove doc Get-Installation-Package to stage (#83)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 2679b10 add doc Deployment-Recommendation and remove doc
Get-Installation-Package to stage (#83)
2679b10 is described below
commit 2679b10d904fe21520485f4a7c944292c7da70ec
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Tue Sep 5 18:20:15 2023 +0800
add doc Deployment-Recommendation and remove doc Get-Installation-Package
to stage (#83)
---
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 1 +
.../Cluster => Deployment-and-Maintenance}/Deployment-Recommendation.md | 0
.../Cluster}/Get-Installation-Package.md| 0
.../Cluster => Deployment-and-Maintenance}/Deployment-Recommendation.md | 0
.../Cluster}/Get-Installation-Package.md| 0
.../Cluster => Deployment-and-Maintenance}/Deployment-Recommendation.md | 0
.../Cluster}/Get-Installation-Package.md| 0
.../Cluster => Deployment-and-Maintenance}/Deployment-Recommendation.md | 0
.../Cluster}/Get-Installation-Package.md| 0
10 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
index 2017603..e0908c2 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/en.ts
@@ -67,7 +67,7 @@ export const enSidebar = {
// children: 'structure',
children: [
{ text: 'Environmental Requirement', link: 'Environmental-Requirement'
},
-{ text: 'Get Installation Package', link: 'Get-Installation-Package' },
+{ text: 'Resource Recommendation', link: 'Deployment-Recommendation' },
{ text: 'Deployment Guide', link: 'Deployment-Guide_timecho' },
{ text: 'Docker Install', link: 'Docker-Install' },
{ text: 'Monitoring-Board-Install-and-Deploy', link:
'Monitoring-Board-Install-and-Deploy' },
diff --git a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
index e509cc4..bc3c047 100644
--- a/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
+++ b/src/.vuepress/sidebar_timecho/V1.2.x/zh.ts
@@ -67,6 +67,7 @@ export const zhSidebar = {
// children: 'structure',
children: [
{ text: '环境要求', link: 'Environmental-Requirement' },
+{ text: '资源推荐', link: 'Deployment-Recommendation' },
{ text: '部署指导', link: 'Deployment-Guide_timecho' },
{ text: 'docker部署', link: 'Docker-Install' },
{ text: '监控面板安装部署', link: 'Monitoring-Board-Install-and-Deploy' },
diff --git a/src/UserGuide/Master/stage/Cluster/Deployment-Recommendation.md
b/src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md
similarity index 100%
rename from src/UserGuide/Master/stage/Cluster/Deployment-Recommendation.md
rename to
src/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md
diff --git
a/src/UserGuide/Master/Deployment-and-Maintenance/Get-Installation-Package.md
b/src/UserGuide/Master/stage/Cluster/Get-Installation-Package.md
similarity index 100%
rename from
src/UserGuide/Master/Deployment-and-Maintenance/Get-Installation-Package.md
rename to src/UserGuide/Master/stage/Cluster/Get-Installation-Package.md
diff --git a/src/UserGuide/V1.2.x/stage/Cluster/Deployment-Recommendation.md
b/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Recommendation.md
similarity index 100%
rename from src/UserGuide/V1.2.x/stage/Cluster/Deployment-Recommendation.md
rename to
src/UserGuide/V1.2.x/Deployment-and-Maintenance/Deployment-Recommendation.md
diff --git
a/src/UserGuide/V1.2.x/Deployment-and-Maintenance/Get-Installation-Package.md
b/src/UserGuide/V1.2.x/stage/Cluster/Get-Installation-Package.md
similarity index 100%
rename from
src/UserGuide/V1.2.x/Deployment-and-Maintenance/Get-Installation-Package.md
rename to src/UserGuide/V1.2.x/stage/Cluster/Get-Installation-Package.md
diff --git a/src/zh/UserGuide/Master/stage/Cluster/Deployment-Recommendation.md
b/src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md
similarity index 100%
rename from src/zh/UserGuide/Master/stage/Cluster/Deployment-Recommendation.md
rename to
src/zh/UserGuide/Master/Deployment-and-Maintenance/Deployment-Recommendation.md
diff --git
a/src/zh/UserGuide/Master/Deployment-and-Maintenance/Get-Installation-Package.md
b/src/zh/UserGuide/Master/stage/Cluster/Get-Installation-Package.md
similarity index 100%
rename from
src/zh/UserGuide/Master/Deployment-and-Maintenance/Get-Installation-Package.md
rename to src/zh/UserGuide/Master/stage/Cluster/Get-Installati
[iotdb] branch ThriftModule deleted (was d3ff4f63648)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch ThriftModule in repository https://gitbox.apache.org/repos/asf/iotdb.git was d3ff4f63648 fix ci The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch master updated (97e083efcec -> a45248d4959)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 97e083efcec [IOTDB-6115] Fix Limit & Offset push down doesn't take
effect while there exist null value
add a45248d4959 Rename iotdb-thrift module to iotdb-thrift-datanode
(#10884)
No new revisions were added by this update.
Summary of changes:
CONTRIBUTING.md | 2 +-
iotdb-client/client-cpp/pom.xml | 2 +-
iotdb-client/client-py/pom.xml| 2 +-
iotdb-core/mlnode/pom.xml | 2 +-
iotdb-protocol/pom.xml| 2 +-
iotdb-protocol/{thrift => thrift-datanode}/README.md | 0
iotdb-protocol/{thrift => thrift-datanode}/pom.xml| 4 ++--
iotdb-protocol/{thrift => thrift-datanode}/rpc-changelist.md | 0
.../{thrift => thrift-datanode}/src/main/thrift/client.thrift | 0
.../{thrift => thrift-datanode}/src/main/thrift/datanode.thrift | 0
pom.xml | 2 +-
11 files changed, 8 insertions(+), 8 deletions(-)
rename iotdb-protocol/{thrift => thrift-datanode}/README.md (100%)
rename iotdb-protocol/{thrift => thrift-datanode}/pom.xml (96%)
rename iotdb-protocol/{thrift => thrift-datanode}/rpc-changelist.md (100%)
rename iotdb-protocol/{thrift =>
thrift-datanode}/src/main/thrift/client.thrift (100%)
rename iotdb-protocol/{thrift =>
thrift-datanode}/src/main/thrift/datanode.thrift (100%)
[iotdb-docs] branch main updated: add the miss file of configuration and a monitor file (#66)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git The following commit(s) were added to refs/heads/main by this push: new 9fd9868 add the miss file of configuration and a monitor file (#66) 9fd9868 is described below commit 9fd98688ced726605444a5424ef6fb51263e14fc Author: wanghui42 <105700158+wanghu...@users.noreply.github.com> AuthorDate: Thu Aug 17 17:32:45 2023 +0800 add the miss file of configuration and a monitor file (#66)
[iotdb-docs] branch main updated: rest add insertRecords doc (#67)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 461b71e rest add insertRecords doc (#67)
461b71e is described below
commit 461b71e39b3c5d6996f1b9276d996eae04ffe5e5
Author: CloudWise-Lukemiao
<76942485+cloudwise-lukem...@users.noreply.github.com>
AuthorDate: Thu Aug 17 17:29:15 2023 +0800
rest add insertRecords doc (#67)
Co-authored-by: Cloudwise_Luke <282583...@qq.com>
---
src/UserGuide/Master/API/RestServiceV1.md| 37
src/UserGuide/Master/API/RestServiceV2.md| 37
src/UserGuide/V1.2.x/API/RestServiceV1.md| 37
src/UserGuide/V1.2.x/API/RestServiceV2.md| 37
src/zh/UserGuide/Master/API/RestServiceV1.md | 37
src/zh/UserGuide/Master/API/RestServiceV2.md | 37
src/zh/UserGuide/V1.2.x/API/RestServiceV1.md | 37
src/zh/UserGuide/V1.2.x/API/RestServiceV2.md | 37
8 files changed, 296 insertions(+)
diff --git a/src/UserGuide/Master/API/RestServiceV1.md
b/src/UserGuide/Master/API/RestServiceV1.md
index 6e22bcb..89ec126 100644
--- a/src/UserGuide/Master/API/RestServiceV1.md
+++ b/src/UserGuide/Master/API/RestServiceV1.md
@@ -843,6 +843,43 @@ Sample response:
}
```
+### insertRecords
+
+Request method: `POST`
+
+Request header: `application/json`
+
+Request path: http://ip:port/rest/v1/insertRecords
+
+Parameter Description:
+
+| parameter name |parameter type |is required|parameter describe|
+|:---| :--- | :---| :---|
+| timestamps | array | yes | Time column |
+| measurementsList | array | yes | The name of the measuring point |
+| dataTypesList | array | yes | The data type |
+| valuesList | array | yes | Value columns, the values in each column
can be `null` |
+| deviceIds | string | yes | Device name |
+
+Example request:
+```shell
+curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232151860,1635232152960],"measurementsList":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"dataTypesList":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"valuesList":[[1,11],[2.1,2],[4,6],[false,"cc"]],"deviceIds":["root.s1","root.s1","root.s1","root.s3"]}'
http://127.0.0.1:18080/rest/v1/insertRecords
+```
+
+Sample response:
+
+|parameter name |parameter type |parameter describe|
+|:--- | :--- | :---|
+| code | integer | status code |
+| message | string | message |
+
+Sample response:
+```json
+{
+ "code": 200,
+ "message": "SUCCESS_STATUS"
+}
+```
## Configuration
diff --git a/src/UserGuide/Master/API/RestServiceV2.md
b/src/UserGuide/Master/API/RestServiceV2.md
index 61cdada..41e753c 100644
--- a/src/UserGuide/Master/API/RestServiceV2.md
+++ b/src/UserGuide/Master/API/RestServiceV2.md
@@ -843,6 +843,43 @@ Sample response:
}
```
+### insertRecords
+
+Request method: `POST`
+
+Request header: `application/json`
+
+Request path: http://ip:port/rest/v2/insertRecords
+
+Parameter Description:
+
+| parameter name|parameter type |is required|parameter describe|
+|:--| :--- | :---| :---|
+| timestamps| array | yes | Time column |
+| measurements_list | array | yes | The name of the measuring point |
+| data_types_list | array | yes | The data type |
+| values_list | array | yes | Value columns, the values in each column
can be `null` |
+| devices | string | yes | Device name |
+
+Example request:
+```shell
+curl -H "Content-Type:application/json" -H "Authorization:Basic cm9vdDpyb290"
-X POST --data
'{"timestamps":[1635232113960,1635232151960,1635232143960,1635232143960],"measurements_list":[["s33","s44"],["s55","s66"],["s77","s88"],["s771","s881"]],"data_types_list":[["INT32","INT64"],["FLOAT","DOUBLE"],["FLOAT","DOUBLE"],["BOOLEAN","TEXT"]],"values_list":[[1,11],[2.1,2],[4,6],[false,"cc"]],"devices":["root.s1","root.s1","root.s1","root.s3"]}'
http://127.0.0.1:18080/rest/v2/insertRecords
+```
+
+Sample response:
+
+|p
[iotdb-docs] branch main updated (a3688d6 -> fc97b94)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git from a3688d6 Add title for performance (#68) add fc97b94 Add hot load compaction configs (#38) No new revisions were added by this update. Summary of changes: .../Master/Reference/Common-Config-Manual.md | 38 +++--- .../V1.2.x/Reference/Common-Config-Manual.md | 38 +++--- .../Master/Reference/Common-Config-Manual.md | 33 ++- .../V1.2.x/Reference/Common-Config-Manual.md | 33 ++- 4 files changed, 72 insertions(+), 70 deletions(-)
[iotdb-docs] branch main updated: fix bug that some titles are too long to be 2 lines (#51)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 3c1493b fix bug that some titles are too long to be 2 lines (#51)
3c1493b is described below
commit 3c1493bd14b393fcc1d775c354d4033774fca615
Author: wanghui42 <105700158+wanghu...@users.noreply.github.com>
AuthorDate: Tue Aug 15 21:09:03 2023 +0800
fix bug that some titles are too long to be 2 lines (#51)
---
src/.vuepress/sidebar/V0.13.x/en.ts| 6 +-
src/.vuepress/sidebar/V1.1.x/en.ts | 6 +-
src/.vuepress/sidebar/V1.2.x/en.ts | 2 +-
src/.vuepress/sidebar_timecho/V0.13.x/en.ts| 6 +-
src/.vuepress/sidebar_timecho/V1.1.x/en.ts | 8 +-
src/.vuepress/sidebar_timecho/V1.1.x/zh.ts | 2 +
src/.vuepress/sidebar_timecho/V1.2.x/en.ts | 5 +-
src/.vuepress/sidebar_timecho/V1.2.x/zh.ts | 3 +
.../Monitoring-Board-Install-and-Deploy.md | 158 +
.../ConfigNode-Config-Manual.md| 0
.../{stage => Reference}/DataNode-Config-Manual.md | 0
.../Monitoring-Board-Install-and-Deploy.md | 158 +
.../ConfigNode-Config-Manual.md| 0
.../{stage => Reference}/DataNode-Config-Manual.md | 0
.../Monitoring-Board-Install-and-Deploy.md | 158 +
.../ConfigNode-Config-Manual.md| 0
.../{stage => Reference}/DataNode-Config-Manual.md | 0
.../Monitoring-Board-Install-and-Deploy.md | 158 +
.../ConfigNode-Config-Manual.md| 0
.../{stage => Reference}/DataNode-Config-Manual.md | 0
20 files changed, 655 insertions(+), 15 deletions(-)
diff --git a/src/.vuepress/sidebar/V0.13.x/en.ts
b/src/.vuepress/sidebar/V0.13.x/en.ts
index 1f05c3e..37562ee 100644
--- a/src/.vuepress/sidebar/V0.13.x/en.ts
+++ b/src/.vuepress/sidebar/V0.13.x/en.ts
@@ -133,14 +133,14 @@ export const enSidebar = {
prefix: 'Process-Data/',
children: [
{ text: 'UDF (User Defined Function)', link:
'UDF-User-Defined-Function' },
-{ text: 'Query Write-back (SELECT INTO)', link: 'Select-Into' },
-{ text: 'CQ (Continuous Query)', link: 'Continuous-Query' },
+{ text: 'Select Into', link: 'Select-Into' },
+{ text: 'Continuous Query', link: 'Continuous-Query' },
{ text: 'Triggers', link: 'Triggers' },
{ text: 'Alerting', link: 'Alerting' },
],
},
{
- text: 'Administration Management',
+ text: 'Administration',
collapsible: true,
prefix: 'Administration-Management/',
children: [
diff --git a/src/.vuepress/sidebar/V1.1.x/en.ts
b/src/.vuepress/sidebar/V1.1.x/en.ts
index 6bcf03c..4decd3d 100644
--- a/src/.vuepress/sidebar/V1.1.x/en.ts
+++ b/src/.vuepress/sidebar/V1.1.x/en.ts
@@ -211,7 +211,7 @@ export const enSidebar = {
],
},
{
- text: 'Administration Management',
+ text: 'Administration',
collapsible: true,
prefix: 'Administration-Management/',
// children: 'structure',
@@ -229,7 +229,7 @@ export const enSidebar = {
{ text: 'Log Tool', link: 'Log-Tool' },
{ text: 'JMX Tool', link: 'JMX-Tool' },
{ text: 'MLogParser Tool', link: 'MLogParser-Tool' },
-{ text: 'IoTDB Data Directory Overview Tool', link:
'IoTDB-Data-Dir-Overview-Tool' },
+{ text: 'Data Directory Overview Tool', link:
'IoTDB-Data-Dir-Overview-Tool' },
{ text: 'TsFile Sketch Tool', link: 'TsFile-Sketch-Tool' },
{ text: 'TsFile Resource Sketch Tool', link:
'TsFile-Resource-Sketch-Tool' },
{ text: 'TsFile Split Tool', link: 'TsFile-Split-Tool' },
@@ -238,7 +238,7 @@ export const enSidebar = {
],
},
{
- text: 'Collaboration of Edge and Cloud',
+ text: ' Edge - Cloud Collaboration',
collapsible: true,
prefix: 'Edge-Cloud-Collaboration/',
// children: 'structure',
diff --git a/src/.vuepress/sidebar/V1.2.x/en.ts
b/src/.vuepress/sidebar/V1.2.x/en.ts
index 01e5fa4..144be26 100644
--- a/src/.vuepress/sidebar/V1.2.x/en.ts
+++ b/src/.vuepress/sidebar/V1.2.x/en.ts
@@ -61,7 +61,7 @@ export const enSidebar = {
],
},
{
- text: 'Deployment and Maintenance',
+ text: 'Deployment & Maintenance',
collapsible: true,
prefix: 'Deployment-and-Maintenance/',
// children: 'structure',
diff --git a/src/.vuepress/sidebar_timecho/V0.13.x/en.ts
b/src/.vuepress/sidebar_timecho/V0.13.x/en.ts
index 1eb4857..0e964ec 100644
--- a/src/.vuepress/sidebar_timecho/V0.13.x/en.ts
+++ b/src/.vuepress/sidebar_timecho/V0.13.x/en.ts
@@ -133,14 +133,14 @@ export const enSidebar = {
prefix: 'Process-Data/',
children: [
{ te
[iotdb] branch change_log_memory_lack_cross deleted (was 3970680363a)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch change_log_memory_lack_cross in repository https://gitbox.apache.org/repos/asf/iotdb.git was 3970680363a change log from error to info when memory lack for cross compaction The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch rel/1.1 updated: change log from error to info when memory lack for cross compaction (#10780)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new f0502bdfd42 change log from error to info when memory lack for cross
compaction (#10780)
f0502bdfd42 is described below
commit f0502bdfd42525e0483b1cadad61900e44f3dd40
Author: Zhang.Jinrui
AuthorDate: Sat Aug 5 10:07:32 2023 +0800
change log from error to info when memory lack for cross compaction (#10780)
---
.../db/engine/compaction/execute/task/CrossSpaceCompactionTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
index 8726ab3a8cb..11ec6228e8a 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -380,7 +380,7 @@ public class CrossSpaceCompactionTask extends
AbstractCompactionTask {
LOGGER.error("Interrupted when allocating memory for compaction", e);
return false;
} catch (CompactionMemoryNotEnoughException e) {
- LOGGER.error("No enough memory for current compaction task {}", this, e);
+ LOGGER.info("No enough memory for current compaction task {}", this);
return false;
}
boolean addReadLockSuccess =
[iotdb] branch self_hosted_1c3d deleted (was 4278f2dfaf6)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch self_hosted_1c3d in repository https://gitbox.apache.org/repos/asf/iotdb.git was 4278f2dfaf6 update workflows The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch master updated: Use self-hosted runner to run 1c3d IT and update the CI workflow (#10474)
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 79d27b79e83 Use self-hosted runner to run 1c3d IT and update the CI
workflow (#10474)
79d27b79e83 is described below
commit 79d27b79e83f94309ac7d7312c96a9dff2c7dc0d
Author: Haonan
AuthorDate: Fri Jul 7 20:35:02 2023 +0800
Use self-hosted runner to run 1c3d IT and update the CI workflow (#10474)
---
.github/workflows/cluster-it-1c1d.yml | 13 ++---
.github/workflows/cluster-it-1c3d.yml | 30 ++-
.github/workflows/main-unix.yml | 66 ---
.github/workflows/{main-win.yml => unit-test.yml} | 33 ++--
4 files changed, 26 insertions(+), 116 deletions(-)
diff --git a/.github/workflows/cluster-it-1c1d.yml
b/.github/workflows/cluster-it-1c1d.yml
index 1e6ff1c1047..81e0407d986 100644
--- a/.github/workflows/cluster-it-1c1d.yml
+++ b/.github/workflows/cluster-it-1c1d.yml
@@ -31,11 +31,8 @@ jobs:
fail-fast: false
max-parallel: 20
matrix:
-java: [ 8, 11, 17 ]
+java: [11]
os: [ ubuntu-latest, windows-latest ]
-include:
- - java: 8
-os: macos-latest
runs-on: ${{ matrix.os }}
steps:
@@ -65,10 +62,10 @@ jobs:
if: ${{ runner.os == 'Linux' }}
shell: bash
run: sudo sysctl -w net.core.somaxconn=65535
- - name: Adjust Mac kernel somaxconn
-if: ${{ runner.os == 'macOS' }}
-shell: bash
-run: sudo sysctl -w kern.ipc.somaxconn=65535
+# - name: Adjust Mac kernel somaxconn
+#if: ${{ runner.os == 'macOS' }}
+#shell: bash
+#run: sudo sysctl -w kern.ipc.somaxconn=65535
- name: IT/UT Test
shell: bash
# we do not compile client-cpp for saving time, it is tested in
client.yml
diff --git a/.github/workflows/cluster-it-1c3d.yml
b/.github/workflows/cluster-it-1c3d.yml
index 6621856b92b..39db785d577 100644
--- a/.github/workflows/cluster-it-1c3d.yml
+++ b/.github/workflows/cluster-it-1c3d.yml
@@ -32,9 +32,9 @@ jobs:
max-parallel: 20
matrix:
java: [ 8, 11, 17 ]
-os: [ ubuntu-latest ]
-runs-on: ${{ matrix.os }}
-
+runs-on: [self-hosted, iotdb]
+# group: self-hosted
+# labels: iotdb
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
@@ -42,30 +42,9 @@ jobs:
with:
distribution: liberica
java-version: ${{ matrix.java }}
- - name: Cache Maven packages
-uses: actions/cache@v3
-with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2-
- name: Check Apache Rat
-run: mvn -B apache-rat:check -P site -P code-coverage
- - name: Adjust network dynamic TCP ports range
-if: ${{ runner.os == 'Windows' }}
-shell: pwsh
run: |
- netsh int ipv4 set dynamicport tcp start=32768 num=32768
- netsh int ipv4 set dynamicport udp start=32768 num=32768
- netsh int ipv6 set dynamicport tcp start=32768 num=32768
- netsh int ipv6 set dynamicport udp start=32768 num=32768
- - name: Adjust Linux kernel somaxconn
-if: ${{ runner.os == 'Linux' }}
-shell: bash
-run: sudo sysctl -w net.core.somaxconn=65535
- - name: Adjust Mac kernel somaxconn
-if: ${{ runner.os == 'macOS' }}
-shell: bash
-run: sudo sysctl -w kern.ipc.somaxconn=65535
+ mvn -B apache-rat:check -P site -P code-coverage
- name: IT/UT Test
shell: bash
# we do not compile client-cpp for saving time, it is tested in
client.yml
@@ -73,6 +52,7 @@ jobs:
run: |
mvn clean verify \
-DskipUTs \
+ -DintegrationTest.forkCount=6 -DConfigNodeMaxHeapSize=1024
-DDataNodeMaxHeapSize=1024 \
-pl integration-test \
-am -PClusterIT
- name: Upload Artifact
diff --git a/.github/workflows/main-unix.yml b/.github/workflows/main-unix.yml
deleted file mode 100644
index 7842a473acb..000
--- a/.github/workflows/main-unix.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Main Mac and Linux
-
-on:
- push:
-branches:
- - master
- - 'rel/*'
- - "new_*"
-paths-ignore:
- - 'docs/**'
- - 'site/**'
- pull_request:
-branches:
- - master
- - 'rel/*'
- - "new_*"
-paths-ignore:
- - 'docs/**'
- - 'site/**'
- # allow manually run the action:
- workflow_dispatch:
-
-concurrency:
- gro
[iotdb] branch rel/1.2 updated: [To rel/1.2] Forbid rename view (#10392)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 02aafdb9d2a [To rel/1.2] Forbid rename view (#10392)
02aafdb9d2a is described below
commit 02aafdb9d2a477caeebbece7d5b893024bfc7cc8
Author: Marcos_Zyk <38524330+marcos...@users.noreply.github.com>
AuthorDate: Fri Jun 30 14:27:24 2023 +0800
[To rel/1.2] Forbid rename view (#10392)
---
.../main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index 7fd3308e7c3..c8b81ce200a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -164,7 +164,6 @@ import
org.apache.iotdb.db.mpp.plan.statement.metadata.template.UnsetSchemaTempl
import
org.apache.iotdb.db.mpp.plan.statement.metadata.view.AlterLogicalViewStatement;
import
org.apache.iotdb.db.mpp.plan.statement.metadata.view.CreateLogicalViewStatement;
import
org.apache.iotdb.db.mpp.plan.statement.metadata.view.DeleteLogicalViewStatement;
-import
org.apache.iotdb.db.mpp.plan.statement.metadata.view.RenameLogicalViewStatement;
import
org.apache.iotdb.db.mpp.plan.statement.metadata.view.ShowLogicalViewStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.AuthorStatement;
import org.apache.iotdb.db.mpp.plan.statement.sys.ClearCacheStatement;
@@ -1051,10 +1050,7 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor {
@Override
public Statement
visitRenameLogicalView(IoTDBSqlParser.RenameLogicalViewContext ctx) {
-RenameLogicalViewStatement renameLogicalViewStatement = new
RenameLogicalViewStatement();
-renameLogicalViewStatement.setOldName(parseFullPath(ctx.fullPath(0)));
-renameLogicalViewStatement.setNewName(parseFullPath(ctx.fullPath(1)));
-return renameLogicalViewStatement;
+throw new SemanticException("Renaming view is not supported.");
}
@Override
[iotdb] branch Optimize-ConfigNode-take-snapshot deleted (was d105d8ed67e)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch Optimize-ConfigNode-take-snapshot in repository https://gitbox.apache.org/repos/asf/iotdb.git was d105d8ed67e Merge branch 'master' into Optimize-ConfigNode-take-snapshot The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[iotdb] branch master updated: [IOTDB-6030] Improve efficiency of ConfigNode PartitionInfo takeSnapshot (#10348)
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 e35e1f3e9b6 [IOTDB-6030] Improve efficiency of ConfigNode
PartitionInfo takeSnapshot (#10348)
e35e1f3e9b6 is described below
commit e35e1f3e9b6f01f7c0febb8c20ba6555bed5ec27
Author: YongzaoDan <33111881+crzbulab...@users.noreply.github.com>
AuthorDate: Wed Jun 28 10:19:45 2023 +0800
[IOTDB-6030] Improve efficiency of ConfigNode PartitionInfo takeSnapshot
(#10348)
---
.../iotdb/confignode/persistence/partition/PartitionInfo.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
index 10f73d0c95b..6267f56e6b6 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
@@ -72,8 +72,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
@@ -780,7 +780,9 @@ public class PartitionInfo implements SnapshotProcessor {
// snapshot operation.
File tmpFile = new File(snapshotFile.getAbsolutePath() + "-" +
UUID.randomUUID());
-try (FileOutputStream fileOutputStream = new FileOutputStream(tmpFile);
+try (BufferedOutputStream fileOutputStream =
+new BufferedOutputStream(
+Files.newOutputStream(tmpFile.toPath()),
PARTITION_TABLE_BUFFER_SIZE);
TIOStreamTransport tioStreamTransport = new
TIOStreamTransport(fileOutputStream)) {
TProtocol protocol = new TBinaryProtocol(tioStreamTransport);
[iotdb] branch ty/packageRefactor deleted (was f90470f32ed)
This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch ty/packageRefactor in repository https://gitbox.apache.org/repos/asf/iotdb.git was f90470f32ed fix refactor problem in it The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
