From 4a6ad6d31a5ea61f25ceefcb17580d6cd318329f Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Tue, 27 Sep 2022 16:18:43 +0800 Subject: [PATCH 01/12] doc-bug-fix --- docs/UserGuide/API/Programming-Java-Native-API.md | 2 +- docs/zh/UserGuide/API/Programming-Java-Native-API.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide/API/Programming-Java-Native-API.md b/docs/UserGuide/API/Programming-Java-Native-API.md index ad00cfbd30e5..a53eb8bb393c 100644 --- a/docs/UserGuide/API/Programming-Java-Native-API.md +++ b/docs/UserGuide/API/Programming-Java-Native-API.md @@ -149,7 +149,7 @@ void createMultiTimeseries(List paths, List dataTypes, ``` void createAlignedTimeseries(String prefixPath, List measurements, List dataTypes, List encodings, - CompressionType compressor, List measurementAliasList); + List compressors, List measurementAliasList); ``` Attention: Alias of measurements are **not supported** currently. diff --git a/docs/zh/UserGuide/API/Programming-Java-Native-API.md b/docs/zh/UserGuide/API/Programming-Java-Native-API.md index 7072bdca8a5b..4c0a82851e17 100644 --- a/docs/zh/UserGuide/API/Programming-Java-Native-API.md +++ b/docs/zh/UserGuide/API/Programming-Java-Native-API.md @@ -152,7 +152,7 @@ void createMultiTimeseries(List paths, List dataTypes, ``` void createAlignedTimeseries(String prefixPath, List measurements, List dataTypes, List encodings, - CompressionType compressor, List measurementAliasList); + List compressors, List measurementAliasList); ``` 注意：目前**暂不支持**使用传感器别名。 From 7f6fc82ed56a210f34c34029b02d4f37dfb390d9 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Wed, 28 Sep 2022 18:30:32 +0800 Subject: [PATCH 02/12] add-Alert-section --- .../{Process-Data => Alert}/Alerting.md | 0 .../{Process-Data => Alert}/Triggers.md | 0 .../{Process-Data => Alert}/Alerting.md | 0 .../{Process-Data => Alert}/Triggers.md | 0 site/src/main/.vuepress/config.js | 16 ++++++++++++++++ 5 files changed, 16 insertions(+) rename docs/UserGuide/{Process-Data => Alert}/Alerting.md (100%) rename docs/UserGuide/{Process-Data => Alert}/Triggers.md (100%) rename docs/zh/UserGuide/{Process-Data => Alert}/Alerting.md (100%) rename docs/zh/UserGuide/{Process-Data => Alert}/Triggers.md (100%) diff --git a/docs/UserGuide/Process-Data/Alerting.md b/docs/UserGuide/Alert/Alerting.md similarity index 100% rename from docs/UserGuide/Process-Data/Alerting.md rename to docs/UserGuide/Alert/Alerting.md diff --git a/docs/UserGuide/Process-Data/Triggers.md b/docs/UserGuide/Alert/Triggers.md similarity index 100% rename from docs/UserGuide/Process-Data/Triggers.md rename to docs/UserGuide/Alert/Triggers.md diff --git a/docs/zh/UserGuide/Process-Data/Alerting.md b/docs/zh/UserGuide/Alert/Alerting.md similarity index 100% rename from docs/zh/UserGuide/Process-Data/Alerting.md rename to docs/zh/UserGuide/Alert/Alerting.md diff --git a/docs/zh/UserGuide/Process-Data/Triggers.md b/docs/zh/UserGuide/Alert/Triggers.md similarity index 100% rename from docs/zh/UserGuide/Process-Data/Triggers.md rename to docs/zh/UserGuide/Alert/Triggers.md diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js index 270ef3e5aaea..e3acc6435b1d 100644 --- a/site/src/main/.vuepress/config.js +++ b/site/src/main/.vuepress/config.js @@ -941,6 +941,14 @@ var config = { ['Process-Data/Alerting','Alerting'], ] }, + { + title: 'Alert', + sidebarDepth: 1, + children: [ + ['Alert/Alerting','Alerting'], + ['Alert/Triggers','Triggers'], + ] + }, { title: 'Administration Management', children: [ @@ -1874,6 +1882,14 @@ var config = { ['Process-Data/Alerting','告警机制'], ] }, + { + title: '告警', + sidebarDepth: 1, + children: [ + ['Alert/Alerting','告警机制'], + ['Alert/Triggers','触发器'], + ] + }, { title: '权限管理', children: [ From 087ae7406039e066e062ddc05937bd66a36e7c53 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Fri, 30 Sep 2022 16:44:27 +0800 Subject: [PATCH 03/12] CLI-special-command --- docs/UserGuide/QuickStart/Command-Line-Interface.md | 12 ++++++++++++ .../UserGuide/QuickStart/Command-Line-Interface.md | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/docs/UserGuide/QuickStart/Command-Line-Interface.md b/docs/UserGuide/QuickStart/Command-Line-Interface.md index cf3abe28ac4a..ee4019b3a085 100644 --- a/docs/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/UserGuide/QuickStart/Command-Line-Interface.md @@ -103,6 +103,18 @@ The Windows system startup commands are as follows: Shell > sbin\start-cli.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableISO8601 -maxPRC 10 ``` +### CLI Special Command +Special commands of Cli are below. +| Command | Description / Example | +|:---|:---| +| `set time_display_type=xxx` | eg. long, default, ISO8601, yyyy-MM-dd HH:mm:ss | +| `show time_display_type` | show time display type | +| `set time_zone=xxx` | eg. +08:00, Asia/Shanghai | +| `show time_zone` | show cli time zone | +| `set fetch_size=xxx` | set fetch size when querying data from server | +| `show fetch_size` | show fetch size | +| `set max_display_num=xxx` | eg. set max lines for cli to ouput, -1 equals to unlimited | + ### Note on using the CLI with OpenID Connect Auth enabled on Server side Openid connect (oidc) uses keycloack as the authority authentication service of oidc service diff --git a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md index e4b56c74793a..1d2701245948 100644 --- a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md @@ -90,6 +90,18 @@ Windows 系统启动命令如下： Shell > sbin\start-cli.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableISO8601 -maxPRC 10 ``` +### CLI 特殊命令 +下面列举了一些CLI的特殊命令。 +| 命令 | 描述 / 例子 | +|:---|:---| +| `set time_display_type=xxx` | eg. long, default, ISO8601, yyyy-MM-dd HH:mm:ss | +| `show time_display_type` | show time display type | +| `set time_zone=xxx` | eg. +08:00, Asia/Shanghai | +| `show time_zone` | show cli time zone | +| `set fetch_size=xxx` | set fetch size when querying data from server | +| `show fetch_size` | show fetch size | +| `set max_display_num=xxx` | eg. set max lines for cli to ouput, -1 equals to unlimited | + ### 使用 OpenID 作为用户名认证登录 OpenID Connect (OIDC) 使用 keycloack 作为 OIDC 服务权限认证服务。 From 1aef5e038333a02b45e9fa77a919c31a44e3c478 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Fri, 30 Sep 2022 17:09:26 +0800 Subject: [PATCH 04/12] add-CLI-special-command --- .../QuickStart/Command-Line-Interface.md | 2 ++ .../QuickStart/Command-Line-Interface.md | 16 +++++++++------- site/src/main/.vuepress/config.js | 8 -------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/docs/UserGuide/QuickStart/Command-Line-Interface.md b/docs/UserGuide/QuickStart/Command-Line-Interface.md index ee4019b3a085..dde7096f5c41 100644 --- a/docs/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/UserGuide/QuickStart/Command-Line-Interface.md @@ -114,6 +114,8 @@ Special commands of Cli are below. | `set fetch_size=xxx` | set fetch size when querying data from server | | `show fetch_size` | show fetch size | | `set max_display_num=xxx` | eg. set max lines for cli to ouput, -1 equals to unlimited | +| `help` | Get hints for CLI special commands | +| `exit/quit` | Exit CLI | ### Note on using the CLI with OpenID Connect Auth enabled on Server side diff --git a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md index 1d2701245948..1fabcc8779e6 100644 --- a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md @@ -94,13 +94,15 @@ Shell > sbin\start-cli.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableISO 下面列举了一些CLI的特殊命令。 | 命令 | 描述 / 例子 | |:---|:---| -| `set time_display_type=xxx` | eg. long, default, ISO8601, yyyy-MM-dd HH:mm:ss | -| `show time_display_type` | show time display type | -| `set time_zone=xxx` | eg. +08:00, Asia/Shanghai | -| `show time_zone` | show cli time zone | -| `set fetch_size=xxx` | set fetch size when querying data from server | -| `show fetch_size` | show fetch size | -| `set max_display_num=xxx` | eg. set max lines for cli to ouput, -1 equals to unlimited | +| `set time_display_type=xxx` | 例如： long, default, ISO8601, yyyy-MM-dd HH:mm:ss | +| `show time_display_type` | 显示时间显示方式 | +| `set time_zone=xxx` | 例如： +08:00, Asia/Shanghai | +| `show time_zone` | 显示CLI的时区 | +| `set fetch_size=xxx` | 从服务器查询数据时设置读取条数 | +| `show fetch_size` | 显示读取条数的大小 | +| `set max_display_num=xxx` | 例如： set max lines for cli to ouput, -1 equals to unlimited | +| `help` | 获取CLI特殊命令的提示 | +| `exit/quit` | 退出CLI | ### 使用 OpenID 作为用户名认证登录 diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js index 4c2f2b141268..c4b847359d5c 100644 --- a/site/src/main/.vuepress/config.js +++ b/site/src/main/.vuepress/config.js @@ -942,14 +942,6 @@ var config = { ['Alert/Triggers','Triggers'], ] }, - { - title: 'Alert', - sidebarDepth: 1, - children: [ - ['Alert/Alerting','Alerting'], - ['Alert/Triggers','Triggers'], - ] - }, { title: 'Administration Management', children: [ From 148634c7ff2874e698d9838b92b731b225fa7a8c Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Fri, 30 Sep 2022 17:16:03 +0800 Subject: [PATCH 05/12] delete-redundancy --- site/src/main/.vuepress/config.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js index c4b847359d5c..f3f4e4a7f4ea 100644 --- a/site/src/main/.vuepress/config.js +++ b/site/src/main/.vuepress/config.js @@ -1875,14 +1875,6 @@ var config = { ['Alert/Triggers','触发器'], ] }, - { - title: '告警', - sidebarDepth: 1, - children: [ - ['Alert/Alerting','告警机制'], - ['Alert/Triggers','触发器'], - ] - }, { title: '权限管理', children: [ From 24b0c80e140bc55d1318d7e874c0e04131c9bf2b Mon Sep 17 00:00:00 2001 From: Haonan Date: Fri, 30 Sep 2022 17:22:56 +0800 Subject: [PATCH 06/12] Apply suggestions from code review --- docs/UserGuide/QuickStart/Command-Line-Interface.md | 4 ++-- docs/zh/UserGuide/QuickStart/Command-Line-Interface.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide/QuickStart/Command-Line-Interface.md b/docs/UserGuide/QuickStart/Command-Line-Interface.md index dde7096f5c41..b09d6caf6df8 100644 --- a/docs/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/UserGuide/QuickStart/Command-Line-Interface.md @@ -104,7 +104,7 @@ Shell > sbin\start-cli.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableISO ``` ### CLI Special Command -Special commands of Cli are below. +Special commands of Cli are below. | Command | Description / Example | |:---|:---| | `set time_display_type=xxx` | eg. long, default, ISO8601, yyyy-MM-dd HH:mm:ss | @@ -113,7 +113,7 @@ Special commands of Cli are below. | `show time_zone` | show cli time zone | | `set fetch_size=xxx` | set fetch size when querying data from server | | `show fetch_size` | show fetch size | -| `set max_display_num=xxx` | eg. set max lines for cli to ouput, -1 equals to unlimited | +| `set max_display_num=xxx` | set max lines for cli to output, -1 equals to unlimited | | `help` | Get hints for CLI special commands | | `exit/quit` | Exit CLI | diff --git a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md index 1fabcc8779e6..98e0a7eed1a4 100644 --- a/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md +++ b/docs/zh/UserGuide/QuickStart/Command-Line-Interface.md @@ -98,9 +98,9 @@ Shell > sbin\start-cli.bat -h 10.129.187.21 -p 6667 -u root -pw root -disableISO | `show time_display_type` | 显示时间显示方式 | | `set time_zone=xxx` | 例如： +08:00, Asia/Shanghai | | `show time_zone` | 显示CLI的时区 | -| `set fetch_size=xxx` | 从服务器查询数据时设置读取条数 | +| `set fetch_size=xxx` | 设置从服务器查询数据时的读取条数 | | `show fetch_size` | 显示读取条数的大小 | -| `set max_display_num=xxx` | 例如： set max lines for cli to ouput, -1 equals to unlimited | +| `set max_display_num=xxx` | 设置 CLI 一次展示的最大数据条数， 设置为-1表示无限制 | | `help` | 获取CLI特殊命令的提示 | | `exit/quit` | 退出CLI | From 54e309c535fa226661c67aed91446f026382015e Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Sat, 8 Oct 2022 17:09:32 +0800 Subject: [PATCH 07/12] catalogue&detail-changes --- docs/UserGuide/Reference/Syntax-Conventions.md | 2 +- docs/zh/UserGuide/Reference/Syntax-Conventions.md | 2 +- site/src/main/.vuepress/config.js | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/UserGuide/Reference/Syntax-Conventions.md b/docs/UserGuide/Reference/Syntax-Conventions.md index 35e88a5a25a5..c492bd55d284 100644 --- a/docs/UserGuide/Reference/Syntax-Conventions.md +++ b/docs/UserGuide/Reference/Syntax-Conventions.md @@ -713,7 +713,7 @@ String[] paths = new String[]{"root.sg.a", "root.sg.`a.``\"b`", "root.sg.`111`"} List pathList = Arrays.asList(paths); ``` -## Learn More +## Detailed Definitions of Lexical and Grammar Please read the lexical and grammar description files in our code repository: diff --git a/docs/zh/UserGuide/Reference/Syntax-Conventions.md b/docs/zh/UserGuide/Reference/Syntax-Conventions.md index d2cc8d60f312..2fb1111d65e5 100644 --- a/docs/zh/UserGuide/Reference/Syntax-Conventions.md +++ b/docs/zh/UserGuide/Reference/Syntax-Conventions.md @@ -713,7 +713,7 @@ String[] paths = new String[]{"root.sg.a", "root.sg.`a.``\"b`", "root.sg.`111`"} List pathList = Arrays.asList(paths); ``` -## 了解更多 +## 词法与文法详细定义 请阅读代码仓库中的词法和语法描述文件： diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js index f3f4e4a7f4ea..9fe9f14d6c2c 100644 --- a/site/src/main/.vuepress/config.js +++ b/site/src/main/.vuepress/config.js @@ -840,9 +840,9 @@ var config = { title: 'Quick Start', children: [ ['QuickStart/QuickStart','Quick Start'], - ['QuickStart/Files','Data storage'], ['QuickStart/WayToGetIoTDB','Download and Setup'], ['QuickStart/Command-Line-Interface','Command Line Interface'], + ['QuickStart/Files','Data storage'] ] }, { @@ -854,7 +854,7 @@ var config = { ['Data-Concept/Data-Type','Data Type'], ['Data-Concept/Encoding','Encoding'], ['Data-Concept/Compression','Compression'], - ['Data-Concept/Time-Partition','Time Partition'], + ['Data-Concept/Time-Partition','Time Partition of Data'], ['Data-Concept/Time-zone','Time zone'] ] }, @@ -1773,9 +1773,9 @@ var config = { title: '快速上手', children: [ ['QuickStart/QuickStart','快速上手'], - ['QuickStart/Files','数据文件存储'], ['QuickStart/WayToGetIoTDB','下载与安装'], - ['QuickStart/Command-Line-Interface','SQL命令行终端(CLI)'] + ['QuickStart/Command-Line-Interface','SQL命令行终端(CLI)'], + ['QuickStart/Files','数据文件存储'] ] }, { @@ -1787,7 +1787,7 @@ var config = { ['Data-Concept/Data-Type','数据类型'], ['Data-Concept/Encoding','编码方式'], ['Data-Concept/Compression','压缩方式'], - ['Data-Concept/Time-Partition','时间分区'], + ['Data-Concept/Time-Partition','数据的时间分区'], ['Data-Concept/Time-zone','时区'] ] }, From 5c95df7263920331fb01501286a51b539d39da27 Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Wed, 12 Oct 2022 17:00:32 +0800 Subject: [PATCH 08/12] add-sentence-and-rename --- docs/UserGuide/Maintenance-Tools/Maintenance-Command.md | 2 +- docs/UserGuide/Operate-Metadata/Storage-Group.md | 3 +++ docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md | 6 +++--- docs/zh/UserGuide/Operate-Metadata/Storage-Group.md | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md index a6b4c6d80d48..c51bacc34100 100644 --- a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md +++ b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md @@ -78,7 +78,7 @@ IoTDB> SET SYSTEM TO READONLY ON CLUSTER ``` -## Timeout +## Kill Query IoTDB supports session and query level timeout. diff --git a/docs/UserGuide/Operate-Metadata/Storage-Group.md b/docs/UserGuide/Operate-Metadata/Storage-Group.md index 609690eaf2a6..7048d01ec481 100644 --- a/docs/UserGuide/Operate-Metadata/Storage-Group.md +++ b/docs/UserGuide/Operate-Metadata/Storage-Group.md @@ -20,6 +20,9 @@ --> # Storage Group Management + +Storage Group can be regarded as Database in the relational database. + ## Create Storage Group According to the storage model we can set up the corresponding storage group. Two SQL statements are supported for creating storage groups, as follows: diff --git a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md index 6562549d8faf..011c90787188 100644 --- a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md +++ b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md @@ -77,7 +77,7 @@ IoTDB> SET SYSTEM TO READONLY ON LOCAL IoTDB> SET SYSTEM TO READONLY ON CLUSTER ``` -## 超时 +## 终止查询 IoTDB 支持 Session 超时和查询超时。 @@ -108,9 +108,9 @@ session.executeQueryStatement(String sql, long timeout) > 如果不配置超时时间参数或将超时时间设置为负数，将使用服务器端默认的超时时间。 > 如果超时时间设置为0，则会禁用超时功能。 -### 查询中止 +### 查询终止 -除了被动地等待查询超时外，IoTDB 还支持主动地中止查询，命令为： +除了被动地等待查询超时外，IoTDB 还支持主动地终止查询，命令为： ```sql KILL QUERY diff --git a/docs/zh/UserGuide/Operate-Metadata/Storage-Group.md b/docs/zh/UserGuide/Operate-Metadata/Storage-Group.md index 6f012a2fa3ab..25f4bf8d1dc1 100644 --- a/docs/zh/UserGuide/Operate-Metadata/Storage-Group.md +++ b/docs/zh/UserGuide/Operate-Metadata/Storage-Group.md @@ -21,6 +21,8 @@ # 存储组管理 +存储组（Storage Group）可以被视为关系数据库中的Database。 + ## 创建存储组 我们可以根据存储模型建立相应的存储组。创建存储组支持两种 SQL 语句，如下所示： From ca452f14a7d2573efd8e6fb74795bd95b814781d Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Thu, 13 Oct 2022 19:29:00 +0800 Subject: [PATCH 09/12] update-data --- docs/UserGuide/Write-Data/Write-Data.md | 4 +++- docs/zh/UserGuide/Write-Data/Write-Data.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/UserGuide/Write-Data/Write-Data.md b/docs/UserGuide/Write-Data/Write-Data.md index 8bc50f4b7205..913414c78ee9 100644 --- a/docs/UserGuide/Write-Data/Write-Data.md +++ b/docs/UserGuide/Write-Data/Write-Data.md @@ -23,7 +23,9 @@ IoTDB provides users with a variety of ways to insert real-time data, such as directly inputting [INSERT SQL statement](../Reference/SQL-Reference.md) in [Client/Shell tools](../QuickStart/Command-Line-Interface.md), or using [Java JDBC](../API/Programming-JDBC.md) to perform single or batch execution of [INSERT SQL statement](../Reference/SQL-Reference.md). -This section mainly introduces the use of [INSERT SQL statement](../Reference/SQL-Reference.md) for real-time data import in the scenario. +NOTE： This section mainly introduces the use of [INSERT SQL statement](../Reference/SQL-Reference.md) for real-time data import in the scenario. + +Writing a repeat timestamp covers the original timestamp data, which can be regarded as updated data. ## Use of INSERT Statements diff --git a/docs/zh/UserGuide/Write-Data/Write-Data.md b/docs/zh/UserGuide/Write-Data/Write-Data.md index 7ce19d04f22b..683bc0065369 100644 --- a/docs/zh/UserGuide/Write-Data/Write-Data.md +++ b/docs/zh/UserGuide/Write-Data/Write-Data.md @@ -26,6 +26,8 @@ IoTDB 为用户提供多种插入实时数据的方式，例如在 [Cli/Shell 本节主要为您介绍实时数据接入的 INSERT 语句在场景中的实际使用示例，有关 INSERT SQL 语句的详细语法请参见本文 [INSERT 语句](../Reference/SQL-Reference.md) 节。 +注：写入重复时间戳的数据则原时间戳数据被覆盖，可视为更新数据。 + ## 使用 INSERT 语句 使用 INSERT 语句可以向指定的已经创建的一条或多条时间序列中插入数据。对于每一条数据，均由一个时间戳类型的时间戳和一个数值或布尔值、字符串类型的传感器采集值组成。 From a13b67046e3f3c9a7393d79b6d326930009c4dde Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Fri, 14 Oct 2022 19:07:16 +0800 Subject: [PATCH 10/12] add-a-sentence-in-kill-query --- docs/UserGuide/Maintenance-Tools/Maintenance-Command.md | 2 +- docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md index c51bacc34100..8bb837eec83d 100644 --- a/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md +++ b/docs/UserGuide/Maintenance-Tools/Maintenance-Command.md @@ -80,7 +80,7 @@ IoTDB> SET SYSTEM TO READONLY ON CLUSTER ## Kill Query -IoTDB supports session and query level timeout. +IoTDB supports setting session connection timeouts and query timeouts, and also allows to stop the executing query manually. ### Session timeout diff --git a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md index 011c90787188..b936c0eb4a15 100644 --- a/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md +++ b/docs/zh/UserGuide/Maintenance-Tools/Maintenance-Command.md @@ -79,7 +79,7 @@ IoTDB> SET SYSTEM TO READONLY ON CLUSTER ## 终止查询 -IoTDB 支持 Session 超时和查询超时。 +IoTDB 支持设置 Session 连接超时和查询超时时间，并支持手动终止正在执行的查询。 ### Session 超时 From 0562d10fdc92cd37a4145b10e7b43f3cf495420a Mon Sep 17 00:00:00 2001 From: wanghui42 Date: Mon, 17 Oct 2022 16:52:00 +0800 Subject: [PATCH 11/12] IOTDB-4653 --- docs/UserGuide/Delete-Data/TTL.md | 16 ++++++++++++++-- docs/zh/UserGuide/Delete-Data/TTL.md | 18 ++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide/Delete-Data/TTL.md b/docs/UserGuide/Delete-Data/TTL.md index 52d16072f6d5..e1c38224d84e 100644 --- a/docs/UserGuide/Delete-Data/TTL.md +++ b/docs/UserGuide/Delete-Data/TTL.md @@ -23,6 +23,8 @@ IoTDB supports storage-level TTL settings, which means it is able to delete old data automatically and periodically. The benefit of using TTL is that hopefully you can control the total disk space usage and prevent the machine from running out of disks. Moreover, the query performance may downgrade as the total number of files goes up and the memory usage also increase as there are more files. Timely removing such files helps to keep at a high query performance level and reduce memory usage. +The default unit of TTL is milliseconds. If the time precision in the configuration file changes to another, the TTL is still set to milliseconds. + ## Set TTL The SQL Statement for setting TTL is as follow: @@ -31,7 +33,7 @@ The SQL Statement for setting TTL is as follow: IoTDB> set ttl to root.ln 3600000 ``` -This example means that for data in `root.ln`, only that of the latest 1 hour will remain, the older one is removed or made invisible. +This example means that for data in `root.ln`, only 3600000 ms, that is, the latest 1 hour will remain, the older one is removed or made invisible. ``` IoTDB> set ttl to root.sgcc.** 3600000 @@ -72,7 +74,17 @@ IoTDB> SHOW TTL ON StorageGroupNames ``` The SHOW ALL TTL example gives the TTL for all storage groups. -The SHOW TTL ON root.group1 , root.group2 , root.group3 example shows the TTL for the three storage +The SHOW TTL ON root.ln,root.sgcc,root.DB example shows the TTL for the three storage groups specified. Note: the TTL for storage groups that do not have a TTL set will display as null. +``` +IoTDB> show all ttl ++-------------+-------+ +|storage group|ttl(ms)| ++-------------+-------+ +| root.ln|3600000| +| root.sgcc| null| +| root.DB|3600000| ++-------------+-------+ +``` \ No newline at end of file diff --git a/docs/zh/UserGuide/Delete-Data/TTL.md b/docs/zh/UserGuide/Delete-Data/TTL.md index 4f76e0b1534a..2c330a542aa9 100644 --- a/docs/zh/UserGuide/Delete-Data/TTL.md +++ b/docs/zh/UserGuide/Delete-Data/TTL.md @@ -25,13 +25,15 @@ IoTDB 支持对存储组级别设置数据存活时间（TTL），这使得 IoTD 可以帮助您控制 IoTDB 占用的总磁盘空间以避免出现磁盘写满等异常。并且，随着文件数量的增多，查询性能往往随之下降， 内存占用也会有所提高。及时地删除一些较老的文件有助于使查询性能维持在一个较高的水平和减少内存资源的占用。 +TTL的默认单位为毫秒，如果配置文件中的时间精度修改为其他单位，设置ttl时仍然使用毫秒单位。 + ## 设置 TTL 设置 TTL 的 SQL 语句如下所示： ``` IoTDB> set ttl to root.ln 3600000 ``` -这个例子表示在`root.ln`存储组中，只有最近一个小时的数据将会保存，旧数据会被移除或不可见。 +这个例子表示在`root.ln`存储组中，只有3600000毫秒，即最近一个小时的数据将会保存，旧数据会被移除或不可见。 ``` IoTDB> set ttl to root.sgcc.** 3600000 ``` @@ -71,5 +73,17 @@ IoTDB> SHOW TTL ON StorageGroupNames ``` SHOW ALL TTL 这个例子会给出所有存储组的 TTL。 -SHOW TTL ON root.group1,root.group2,root.group3 这个例子会显示指定的三个存储组的 TTL。 +SHOW TTL ON root.ln,root.sgcc,root.DB 这个例子会显示指定的三个存储组的 TTL。 注意：没有设置 TTL 的存储组的 TTL 将显示为 null。 + +``` +IoTDB> show all ttl ++-------------+-------+ +|storage group|ttl(ms)| ++-------------+-------+ +| root.ln|3600000| +| root.sgcc| null| +| root.DB|3600000| ++-------------+-------+ +``` + From b5166a8f36fd3b40bdf87b150919137fdfb1fa18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:33:13 +0000 Subject: [PATCH 12/12] Bump hadoop2.version from 2.10.1 to 2.10.2 Bumps `hadoop2.version` from 2.10.1 to 2.10.2. Updates `hadoop-client` from 2.10.1 to 2.10.2 Updates `hadoop-yarn-common` from 2.10.1 to 2.10.2 Updates `hadoop-yarn-api` from 2.10.1 to 2.10.2 Updates `hadoop-yarn-server-common` from 2.10.1 to 2.10.2 Updates `hadoop-common` from 2.10.1 to 2.10.2 Updates `hadoop-annotations` from 2.10.1 to 2.10.2 --- updated-dependencies: - dependency-name: org.apache.hadoop:hadoop-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.hadoop:hadoop-yarn-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.hadoop:hadoop-yarn-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.hadoop:hadoop-yarn-server-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.hadoop:hadoop-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.hadoop:hadoop-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44f42d20ad10..8380a5bb8bf6 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 3.1.0 2.11 2.11.12 - 2.10.1 + 2.10.2 2.3.6 4.13.2 1.7.12