[iotdb] branch master updated: [IOTDB-2386] Add aggregate query and query cannot appear in SQL user guide at the same time (#4817)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rong 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 2e5c9e6  [IOTDB-2386] Add aggregate query and query cannot appear in SQL user guide at the same time (#4817)
2e5c9e6 is described below

commit 2e5c9e699a815dd358677a660c1cddd5738cb87c
Author: LLY <48...@users.noreply.github.com>
AuthorDate: Fri Jan 14 16:09:00 2022 +0800

    [IOTDB-2386] Add aggregate query and query cannot appear in SQL user guide at the same time (#4817)
---
 docs/UserGuide/Advanced-Features/Select-Into.md                   | 2 +-
 .../IoTDB-SQL-Language/DML-Data-Manipulation-Language.md          | 8 ++++++++
 docs/zh/UserGuide/Advanced-Features/Select-Into.md                | 2 +-
 .../IoTDB-SQL-Language/DML-Data-Manipulation-Language.md          | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/UserGuide/Advanced-Features/Select-Into.md b/docs/UserGuide/Advanced-Features/Select-Into.md
index a1e6ba2..3e86c20 100644
--- a/docs/UserGuide/Advanced-Features/Select-Into.md
+++ b/docs/UserGuide/Advanced-Features/Select-Into.md
@@ -134,7 +134,7 @@ When the target aligned timeseries are not existed, the system will automaticall
 
 ### Supported Query Types
 
-**Note that except for the following types of queries, other types of queries (such as `LAST` queries) are not supported. **
+**Note that except for the following types of queries, other types of queries (such as `LAST` queries and raw aggregation queries) are not supported. **
 
 * Raw time series query
 
diff --git a/docs/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md b/docs/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
index 1258340..1c647eb 100644
--- a/docs/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
+++ b/docs/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
@@ -802,6 +802,14 @@ It costs 0.007s
 
 This section mainly introduces the related examples of aggregate query.
 
+> Please note that mixed use of `Aggregate Query` and `Timeseries Query` is not allowed. Below are examples for queries that are not allowed.
+>
+> ```
+> select a, count(a) from root.sg 
+> select sin(a), count(a) from root.sg
+> select a, count(a) from root.sg group by ([10,100),10ms)
+> ```
+
 #### Count Points
 
 ```sql
diff --git a/docs/zh/UserGuide/Advanced-Features/Select-Into.md b/docs/zh/UserGuide/Advanced-Features/Select-Into.md
index 2197e3c..b1ca5a8 100644
--- a/docs/zh/UserGuide/Advanced-Features/Select-Into.md
+++ b/docs/zh/UserGuide/Advanced-Features/Select-Into.md
@@ -135,7 +135,7 @@ intoPath
 
 ### 支持写回的查询类型
 
-**注意，除了下述类型的查询，其余类型的查询（如`LAST`查询）都不被支持。**
+**注意，除了下述类型的查询，其余类型的查询（如`LAST`查询和原始聚合查询）都不被支持。**
 
 * 原始序列查询
 
diff --git a/docs/zh/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md b/docs/zh/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
index e964467..e93a529 100644
--- a/docs/zh/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
+++ b/docs/zh/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
@@ -824,6 +824,14 @@ It costs 0.007s
 本章节主要介绍聚合查询的相关示例，
 主要使用的是 IoTDB SELECT 语句的聚合查询函数。
 
+> 需要注意的是，聚合查询和时间序列查询不能混合使用。下述语句就是不支持的：
+>
+> ```sql
+> select a, count(a) from root.sg
+> select sin(a), count(a) from root.sg
+> select a, count(a) from root.sg group by ([10,100),10ms)
+> ```
+
 #### 统计总点数
 
 ```sql