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

haonan pushed a commit to branch NewDoc
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/NewDoc by this push:
     new 1d7edfb  replace some pictures with table
1d7edfb is described below

commit 1d7edfb416b7222a261266d89ef3f18d00ed158c
Author: HTHou <[email protected]>
AuthorDate: Thu Mar 4 16:32:56 2021 +0800

    replace some pictures with table
---
 docs/zh/UserGuide/Get Started/QuickStart.md        | 13 ++++---
 .../UserGuide/Operation Manual/Administration.md   | 41 ++++++++++++++++++----
 .../DDL Data Definition Language.md                | 30 +++++++++++++++-
 .../DML Data Manipulation Language.md              |  4 ++-
 docs/zh/UserGuide/Operation Manual/Kill Query.md   |  7 ++--
 5 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/docs/zh/UserGuide/Get Started/QuickStart.md 
b/docs/zh/UserGuide/Get Started/QuickStart.md
index 3033eaa..730cb63 100644
--- a/docs/zh/UserGuide/Get Started/QuickStart.md       
+++ b/docs/zh/UserGuide/Get Started/QuickStart.md       
@@ -131,12 +131,12 @@ IoTDB> SHOW STORAGE GROUP
 执行结果为:
 
 ```
-+-----------------------------------+
-|                      Storage Group|
-+-----------------------------------+
-|                            root.ln|
-+-----------------------------------+
-storage group number = 1
++-------------+
+|storage group|
++-------------+
+|      root.ln|
++-------------+
+Total line number = 1
 ```
 
 存储组设定后,使用CREATE 
TIMESERIES语句可以创建新的时间序列,创建时间序列时需要定义数据的类型和编码方式。此处我们创建两个时间序列,SQL语句如下:
@@ -279,4 +279,3 @@ Windows系统停止命令如下:
   * 系统配置模块 (`iotdb-engine.properties`)
   * 日志配置模块 (`logback.xml`). 
 
-想要了解更多,请浏览[Server](../Server/Download.md)
diff --git a/docs/zh/UserGuide/Operation Manual/Administration.md 
b/docs/zh/UserGuide/Operation Manual/Administration.md
index 357a8cc..ad3de29 100644
--- a/docs/zh/UserGuide/Operation Manual/Administration.md      
+++ b/docs/zh/UserGuide/Operation Manual/Administration.md      
@@ -60,9 +60,24 @@ CREATE USER sgcc_write_user 'write_pwd'
 ```
 LIST USER
 ```
-我们可以看到这两个已经被创建的用户,结果如图:
+我们可以看到这两个已经被创建的用户,结果如下:
 
-<center><img style="width:100%; max-width:800px; max-height:600px; 
margin-left:auto; margin-right:auto; display:block;" 
src="https://user-images.githubusercontent.com/13203019/51578263-e2a91d00-1ef7-11e9-94e8-28819b6fea87.jpg";></center>
+```
+IoTDB> CREATE USER ln_write_user 'write_pwd'
+Msg: The statement is executed successfully.
+IoTDB> CREATE USER sgcc_write_user 'write_pwd'
+Msg: The statement is executed successfully.
+IoTDB> LIST USER
++---------------+
+|           user|
++---------------+
+|  ln_write_user|
+|           root|
+|sgcc_write_user|
++---------------+
+Total line number = 3
+It costs 0.157s
+```
 
 ### 赋予用户权限
 
@@ -71,8 +86,14 @@ LIST USER
 ```
 INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
 ```
-此时,系统不允许用户进行此操作,会提示错误,如图:
-<center><img style="width:100%; max-width:800px; max-height:600px; 
margin-left:auto; margin-right:auto; display:block;" 
src="https://user-images.githubusercontent.com/13203019/51597609-9af5b600-1f36-11e9-9460-8ab185eb4735.png";></center>
+此时,系统不允许用户进行此操作,会提示错误:
+
+```
+IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp,status) 
values(1509465600000,true)
+INSERT INTO root.ln.wf01.wt01(timestamp,status) values(1509465600000,true)
+Msg: 602: No permissions for this operation INSERT
+```
+
 
 现在,我们分别赋予他们向对应存储组数据的写入权限,并再次尝试向对应的存储组进行数据写入。SQL语句为:
 ```
@@ -80,8 +101,16 @@ GRANT USER ln_write_user PRIVILEGES 'INSERT_TIMESERIES' on 
root.ln
 GRANT USER sgcc_write_user PRIVILEGES 'INSERT_TIMESERIES' on root.sgcc
 INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, true)
 ```
-执行状态如图所示:
-<center><img style="width:100%; max-width:800px; max-height:600px; 
margin-left:auto; margin-right:auto; display:block;" 
src="https://user-images.githubusercontent.com/13203019/51578942-33ba1080-1efa-11e9-891c-09d69791aff1.jpg";></center>
+执行状态如下所示:
+
+```
+IoTDB> GRANT USER ln_write_user PRIVILEGES 'INSERT_TIMESERIES' on root.ln
+Msg: The statement is executed successfully.
+IoTDB> GRANT USER sgcc_write_user PRIVILEGES 'INSERT_TIMESERIES' on root.sgcc
+Msg: The statement is executed successfully.
+IoTDB> INSERT INTO root.ln.wf01.wt01(timestamp, status) values(1509465600000, 
true)
+Msg: The statement is executed successfully.
+```
 
 ## 其他说明
 
diff --git a/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md 
b/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md
index 5c62988..f0f8184 100644
--- a/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md        
+++ b/docs/zh/UserGuide/Operation Manual/DDL Data Definition Language.md        
@@ -249,7 +249,35 @@ IoTDB > COUNT TIMESERIES root.ln.wf01 GROUP BY LEVEL=2
 ```
 
 你将得到以下结果:
-<center><img style="width:100%; max-width:800px; margin-left:auto; 
margin-right:auto; display:block;" 
src="https://user-images.githubusercontent.com/19167280/69792071-cb664a80-1200-11ea-8386-02dd12046c4b.png";></center>
+
+```
+IoTDB> COUNT TIMESERIES root GROUP BY LEVEL=1
++---------+-----+
+|   column|count|
++---------+-----+
+|  root.ln|    4|
+|root.sgcc|    2|
++---------+-----+
+Total line number = 2
+It costs 0.103s
+IoTDB > COUNT TIMESERIES root.ln GROUP BY LEVEL=2
++--------------+-----+
+|        column|count|
++--------------+-----+
+|  root.ln.wf02|    1|
+|  root.ln.wf01|    3|
++--------------+-----+
+Total line number = 2
+It costs 0.003s
+IoTDB > COUNT TIMESERIES root.ln.wf01 GROUP BY LEVEL=2
++--------------+-----+
+|        column|count|
++--------------+-----+
+|  root.ln.wf01|    4|
++--------------+-----+
+Total line number = 1
+It costs 0.001s
+```
 
 > 注意:时间序列的路径只是过滤条件,与level的定义无关。
 
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 710af66..0d16cd3 100644
--- a/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md      
+++ b/docs/zh/UserGuide/Operation Manual/DML Data Manipulation Language.md      
@@ -649,7 +649,9 @@ select last <Path> [COMMA <Path>]* from < PrefixPath > 
[COMMA < PrefixPath >]* <
 结果集为三列的结构
 
 ```
-| Time | Path | Value |
++----+----------+-----+
+|Time|timeseries|value|
++----+----------+-----+
 ```
 
 示例 1:查询 root.ln.wf01.wt01.status 的最新数据点
diff --git a/docs/zh/UserGuide/Operation Manual/Kill Query.md 
b/docs/zh/UserGuide/Operation Manual/Kill Query.md
index 1e88744..31e4631 100644
--- a/docs/zh/UserGuide/Operation Manual/Kill Query.md  
+++ b/docs/zh/UserGuide/Operation Manual/Kill Query.md  
@@ -64,9 +64,12 @@ IoTDB> CREATE SNAPSHOT FOR SCHEMA
 
 #### 查询超时
 
-对于执行时间过长的查询,IoTDB 将强行中断该查询,并抛出超时异常,如图所示:
+对于执行时间过长的查询,IoTDB 将强行中断该查询,并抛出超时异常,如下所示:
 
-![image](https://user-images.githubusercontent.com/34242296/104586593-a224aa00-56a0-11eb-9c52-241dcdb68ecb.png)
+```
+IoTDB> select * from root;
+Msg: 701 Current query is time out, please check your statement or modify 
timeout parameter.
+```
 
 系统默认的超时时间为 60000 ms,可以在配置文件中通过 `query_time_threshold` 参数进行自定义配置。
 

Reply via email to