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/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a358047 fix doc
a358047 is described below
commit a3580479b91119a13e91bfca49b533357a5945bc
Author: qiaojialin <[email protected]>
AuthorDate: Wed May 27 11:16:07 2020 +0800
fix doc
---
.../UserGuide/Operation Manual/DML Data Manipulation Language.md | 4 ++--
docs/UserGuide/Operation Manual/SQL Reference.md | 2 ++
.../UserGuide/Operation Manual/DML Data Manipulation Language.md | 9 +++++----
docs/zh/UserGuide/Operation Manual/SQL Reference.md | 2 ++
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
b/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
index fa944b2..29e1453 100644
--- a/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
+++ b/docs/UserGuide/Operation Manual/DML Data Manipulation Language.md
@@ -515,7 +515,7 @@ The result is shown below:
The SQL statement is:
```
-select count(status), max_value(temperature) from root.ln.wf01.wt01 group by
(1d,[2017-11-01T00:00:00, 2017-11-07T23:00:00]) limit 5 offset 3
+select count(status), max_value(temperature) from root.ln.wf01.wt01 group by
([2017-11-01T00:00:00, 2017-11-07T23:00:00),1d) limit 5 offset 3
```
which means:
@@ -574,7 +574,7 @@ The result is shown below:
The SQL statement is:
```
-select max_value(*) from root.ln.wf01.wt01 group by (1d, [2017-11-01T00:00:00,
2017-11-07T23:00:00]) slimit 1 soffset 1
+select max_value(*) from root.ln.wf01.wt01 group by ([2017-11-01T00:00:00,
2017-11-07T23:00:00),1d) slimit 1 soffset 1
```
The result is shown below:
diff --git a/docs/UserGuide/Operation Manual/SQL Reference.md
b/docs/UserGuide/Operation Manual/SQL Reference.md
index 0483a19..53eadd7 100644
--- a/docs/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/UserGuide/Operation Manual/SQL Reference.md
@@ -423,7 +423,9 @@ PreviousUntilLastClause : PREVIOUSUNTILLAST
Eg: SELECT last_value(temperature) FROM root.ln.wf01.wt01 GROUP BY([20, 100),
5m) FILL (float[PREVIOUS])
Eg: SELECT last_value(temperature) FROM root.ln.wf01.wt01 GROUP BY((15, 100],
5m) FILL (float[PREVIOUS])
Eg: SELECT last_value(power) FROM root.ln.wf01.wt01 GROUP BY([20, 100), 5m)
FILL (int32[PREVIOUSUNTILLAST])
+Eg: SELECT last_value(power) FROM root.ln.wf01.wt01 GROUP BY([20, 100), 5m)
FILL (int32[PREVIOUSUNTILLAST, 5m])
Eg: SELECT last_value(temperature), last_value(power) FROM root.ln.wf01.wt01
GROUP BY([20, 100), 5m) FILL (ALL[PREVIOUS])
+Eg: SELECT last_value(temperature), last_value(power) FROM root.ln.wf01.wt01
GROUP BY([20, 100), 5m) FILL (ALL[PREVIOUS, 5m])
Note: In group by fill, sliding step is not supported in group by clause
Note: Now, only last_value aggregation function is supported in group by fill.
Note: Linear fill is not supported in group by fill.
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 4c875f4..f7f9e82 100644
--- a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md
+++ b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md
@@ -313,6 +313,7 @@ SQL 示例:
```
SELECT last_value(temperature) as last_temperature FROM root.ln.wf01.wt01
GROUP BY([8, 39), 5m) FILL (int32[PREVIOUSUNTILLAST])
+SELECT last_value(temperature) as last_temperature FROM root.ln.wf01.wt01
GROUP BY([8, 39), 5m) FILL (int32[PREVIOUSUNTILLAST, 3m])
```
解释:
@@ -486,7 +487,7 @@ select temperature from root.sgcc.wf03.wt01 where time =
2017-11-01T16:37:50.000
</center>
-> 注意：在版本0.7.0中，应在Fill语句中至少指定一种填充方法。
+> 注意：应在Fill语句中至少指定一种填充方法。
### 对查询结果的行和列控制
@@ -495,7 +496,7 @@ IoTDB提供
[LIMIT/SLIMIT](../Operation%20Manual/SQL%20Reference.html) 子句和
请注意，按组查询不支持LIMIT和OFFSET。
-本章主要介绍查询结果的行和列控制的相关示例。你还可以使用 [Java
JDBC](../4-Client/3-Programming%20-%20JDBC.html) 标准接口执行查询。
+本章主要介绍查询结果的行和列控制的相关示例。你还可以使用 [Java
JDBC](../Client/Programming%20-%20JDBC.html) 标准接口执行查询。
#### 查询结果的行控制
@@ -554,7 +555,7 @@ select status,temperature from root.ln.wf01.wt01 where time
> 2017-11-01T00:05:0
SQL语句是：
```
-select count(status), max_value(temperature) from root.ln.wf01.wt01 group by
(1d,[2017-11-01T00:00:00, 2017-11-07T23:00:00]) limit 5 offset 3
+select count(status), max_value(temperature) from root.ln.wf01.wt01 group by
([2017-11-01T00:00:00, 2017-11-07T23:00:00),1d) limit 5 offset 3
```
意思是：
@@ -616,7 +617,7 @@ select * from root.ln.wf01.wt01 where time >
2017-11-01T00:05:00.000 and time <
SQL语句是：
```
-select max_value(*) from root.ln.wf01.wt01 group by (1d, [2017-11-01T00:00:00,
2017-11-07T23:00:00]) slimit 1 soffset 1
+select max_value(*) from root.ln.wf01.wt01 group by ([2017-11-01T00:00:00,
2017-11-07T23:00:00),1d) slimit 1 soffset 1
```
diff --git a/docs/zh/UserGuide/Operation Manual/SQL Reference.md
b/docs/zh/UserGuide/Operation Manual/SQL Reference.md
index 818ae2c..add2f04 100644
--- a/docs/zh/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/zh/UserGuide/Operation Manual/SQL Reference.md
@@ -414,7 +414,9 @@ PreviousUntilLastClause : PREVIOUSUNTILLAST
Eg: SELECT last_value(temperature) FROM root.ln.wf01.wt01 GROUP BY([20, 100),
5m) FILL (float[PREVIOUS])
Eg: SELECT last_value(temperature) FROM root.ln.wf01.wt01 GROUP BY((15, 100],
5m) FILL (float[PREVIOUS])
Eg: SELECT last_value(power) FROM root.ln.wf01.wt01 GROUP BY([20, 100), 5m)
FILL (int32[PREVIOUSUNTILLAST])
+Eg: SELECT last_value(power) FROM root.ln.wf01.wt01 GROUP BY([20, 100), 5m)
FILL (int32[PREVIOUSUNTILLAST, 5m])
Eg: SELECT last_value(temperature), last_value(power) FROM root.ln.wf01.wt01
GROUP BY([20, 100), 5m) FILL (ALL[PREVIOUS])
+Eg: SELECT last_value(temperature), last_value(power) FROM root.ln.wf01.wt01
GROUP BY([20, 100), 5m) FILL (ALL[PREVIOUS, 5m])
Note: In group by fill, sliding step is not supported in group by clause
Note: Now, only last_value aggregation function is supported in group by fill.
Note: Linear fill is not supported in group by fill.
