You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 09:30:03 UTC
[iotdb] branch master updated: [MOD] repair broken link to SQL
REFERENCE (#2083)
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 997e595 [MOD] repair broken link to SQL REFERENCE (#2083)
997e595 is described below
commit 997e59560a64a3cf5dd1519bf0dd629469c7dfbc
Author: rhmangmang <10...@qq.com>
AuthorDate: Sun Nov 22 17:29:44 2020 +0800
[MOD] repair broken link to SQL REFERENCE (#2083)
---
.../UserGuide/Operation Manual/DML Data Manipulation Language.md | 8 ++++----
.../UserGuide/Operation Manual/DML Data Manipulation Language.md | 9 +++------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md b/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
index b700c98..46f4d2e 100644
--- a/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
+++ b/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
@@ -735,7 +735,7 @@ The result set is：
#### Other ResultSet Format
-In addition, IoTDB supports two other result set format: 'align by device' and 'disable align'.
+In addition, IoTDB supports two other results set format: 'align by device' and 'disable align'.
The 'align by device' indicates that the deviceId is considered as a column. Therefore, there are totally limited columns in the dataset.
@@ -745,9 +745,9 @@ The SQL statement is:
select s1,s2 from root.sg1.* align by device
```
-For more syntax description, please read SQL REFERENCE.
+For more syntax description, please read [SQL Reference](../Operation%20Manual/SQL%20Reference.md).
-The 'disable align' indicates that there are 3 columns for each time series in the result set. Disable Align Clause can only be used at the end of a query statement. Disable Align Clause cannot be used with Aggregation, Fill Statements, Group By or Group By Device Statements, but can with Limit Statements. The display principle of the result table is that only when the column (or row) has existing data will the column (or row) be shown, with nonexistent cells being empty.
+The 'disable align' indicates that there are 2 columns for each time series in the result set. Disable Align Clause can only be used at the end of a query statement. Disable Align Clause cannot be used with Aggregation, Fill Statements, Group By or Group By Device Statements, but can with Limit Statements. The display principle of the result table is that only when the column (or row) has existing data will the column (or row) be shown, with nonexistent cells being empty.
The SQL statement is:
@@ -755,7 +755,7 @@ The SQL statement is:
select * from root.sg1 where time > 10 disable align
```
-For more syntax description, please read SQL REFERENCE.
+For more syntax description, please read [SQL Reference](../Operation%20Manual/SQL%20Reference.md).
#### Error Handling
diff --git a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md
index eeed92a..dc77017 100644
--- a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md
+++ b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md
@@ -174,9 +174,7 @@ IoTDB支持另外两种结果返回形式: 按设备时间对齐 'align by devic
select s1,s2 from root.sg1.* align by device
```
-更多语法请参照 SQL REFERENCE。
-
-'disable align' 意味着每条时序就有3列存在。Disable Align只能用于查询语句句尾，不能用于聚合查询、Fill语句、Group by或Group by device语句，但可用于Limit语句。结果显示若无数据显示为空白。
+'disable align' 意味着每条时序就有 2 列存在。Disable Align只能用于查询语句句尾，不能用于聚合查询、Fill语句、Group by或Group by device语句，但可用于Limit语句。结果显示若无数据显示为空白。
SQL形如:
@@ -184,7 +182,7 @@ SQL形如:
select * from root.sg1 where time > 10 disable align
```
-更多语法请参照 SQL REFERENCE。
+更多语法请参照[SQL REFERENCE](../Operation%20Manual/SQL%20Reference.md)。
### 聚合查询
本章节主要介绍聚合查询的相关示例，
@@ -800,9 +798,8 @@ select s1,s2 from root.sg1.* ALIGN BY DEVICE
```
-有关更多语法描述，请阅读SQL REFERENCE。
-“禁用对齐”指示结果集中每个时间序列都有3列。 有关更多语法描述，请阅读SQL REFERENCE。
+“禁用对齐”指示结果集中每个时间序列都有3列。 有关更多语法描述，更多语法请参照 [SQL REFERENCE](../Operation%20Manual/SQL%20Reference.md).
#### 错误处理