+
+**图2.1 属性层级组织结构**
+
在图1.1中，用户可以通过JDBC将来自设备上传感器采集的时序数据、服务器负载和CPU内存等系统状态数据、消息队列中的时序数据、应用程序的时序数据或者其他数据库中的时序数据导入到本地或者远程的IoTDB中。用户还可以将上述数据直接写成本地（或位于HDFS上）的TsFile文件。
diff --git a/docs/Documentation-CHN/UserGuide/1-Overview/4-Features.md b/docs/Documentation-CHN/UserGuide/1-Overview/4-Features.md
index 6ddfeb10ca2218f010c621cffd8bef14fc622271..63bf4070f11e88c32d83f7a40ea926ea8f4f0f4b 100644
--- a/docs/Documentation-CHN/UserGuide/1-Overview/4-Features.md
+++ b/docs/Documentation-CHN/UserGuide/1-Overview/4-Features.md
@@ -40,12 +40,12 @@ IoTDB具有以下特点：
* 以及同时具备上述特点的混合负载
* 面向时间序列的丰富查询语义
* 跨设备、跨传感器的时间序列时间对齐
- * 面向时序数据特征的计算（频域变换，0.7.0版本不支持）
+ * 面向时序数据特征的计算
* 提供面向时间维度的丰富聚合函数支持
* 极低的学习门槛
* 支持类SQL的数据操作
* 提供JDBC的编程接口
- * 完善的导入导出工具（0.7.0版本不支持）
+ * 完善的导入导出工具
* 完美对接开源生态环境
* 支持开源数据分析生态系统：Hadoop、Spark
* 支持开源可视化工具对接：Grafana
diff --git a/docs/Documentation-CHN/UserGuide/2-Concept/1-Key Concepts and Terminology.md b/docs/Documentation-CHN/UserGuide/2-Concept/1-Data Model and Terminology.md
similarity index 83%
rename from docs/Documentation-CHN/UserGuide/2-Concept/1-Key Concepts and Terminology.md
rename to docs/Documentation-CHN/UserGuide/2-Concept/1-Data Model and Terminology.md
index 7fb5bcdc7ebd9ce8cf9688223265916fdc495696..00012ef98060acca061d20be0f519df27793136f 100644
--- a/docs/Documentation-CHN/UserGuide/2-Concept/1-Key Concepts and Terminology.md
+++ b/docs/Documentation-CHN/UserGuide/2-Concept/1-Data Model and Terminology.md
@@ -20,9 +20,21 @@
-->
# 第2章 IoTDB基本概念
-## 主要概念及术语
+## 数据模型与技术
-IoTDB中涉及如下基本概念：
+我们为您提供一份简化的[样例数据](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt)。
+
+下载文件: [IoTDB-SampleData.txt](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt).
+
+根据本文描述的[数据](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt)属性层级，按照属性涵盖范围以及它们之间的从属关系，我们可将其表示为如下图2.1的属性层级组织结构，其层级关系为：集团层-电场层-设备层-传感器层。其中ROOT为根节点，传感器层的每一个节点称为叶子节点。在使用IoTDB的过程中，您可以直接将由ROOT节点到每一个叶子节点路径上的属性用“.”连接，将其作为一个IoTDB的时间序列的名称。图2.1中最左侧的路径可以生成一个名为`ROOT.ln.wf01.wt01.status`的时间序列。
+
+
+
+**图2.1 属性层级组织结构**
-
-**图3.2 三类参数实际含义**
-
-### 配置参数
-
-配置文件位置：conf/iotdb-engine.properties
-
-
-
-**属性**
-
-1. EnableStat：是否开启性能监控模块，如果被设置为true，则性能监控模块会记录每个操作的耗时并打印结果。这个参数不能直接通过jconsole直接更改，但可通过下方的函数来进行动态设置。
-2. DisplayIntervalInMs：相邻两次打印结果的时间间隔。这个参数可以直接设置，但它要等性能监控模块重启才会生效。重启性能监控模块可以通过先调用 stopStatistic()然后调用startContinuousStatistics()或者直接调用 startOneTimeStatistics()实现。
-3. OperationSwitch：这个属性用来展示针对每一种操作是否开启了监控统计，map的键为操作的名字，值为是否针对这种操作开启性能监控。这个参数不能直接通过jconsole直接更改，但可通过下方的 'changeOperationSwitch()'函数来进行动态设置。
-
-**操作**
-
-1. startContinuousStatistics：开启性能监控并以‘DisplayIntervalInMs’的时间间隔打印统计结果。
-2. startOneTimeStatistics：开启性能监控并以‘DisplayIntervalInMs’的时间延迟打印一次统计结果。
-3. stopStatistic：关闭性能监控。
-4. clearStatisticalState(): 清除以统计的结果，从新开始统计。
-5. changeOperationSwitch(String operationName, Boolean operationState):设置是否针对每一种不同的操作开启监控。参数‘operationName是操作的名称，在OperationSwitch属性中展示了所有操作的名称。参数 ‘operationState’是操作的状态，打开或者关闭。如果状态设置成功则此函数会返回true，否则返回false。
-
-### 自定义操作类型监控其他区域
-
-**增加操作项**
-
-在org.apache.iotdb.db.cost.statistic.Operation类中增加一个枚举项来表示新增的操作.
-
-**在监控区域增加监控代码**
-
-在监控开始区域增加计时代码:
-
- long t0 = System. currentTimeMillis();
-
-在监控结束区域增加记录代码:
-
- Measurement.INSTANCE.addOperationLatency(Operation, t0);
-
-## cache命中率统计
-
-### 概述
-
-为了提高查询性能，IOTDB对ChunkMetaData和TsFileMetaData进行了缓存。用户可以通过debug级别的日志以及MXBean两种方式来查看缓存的命中率，并根据缓存命中率以及系统内存来调节缓存所使用的内存大小。使用MXBean查看缓存命中率的方法为：
-1. 通过端口31999连接jconsole，并在上方菜单项中选择‘MBean’.
-2. 展开侧边框并选择 'org.apache.iotdb.db.service'. 将会得到如下图所示结果：
-
-
\ No newline at end of file
diff --git a/docs/Documentation-CHN/UserGuide/5-Management/3-System log.md b/docs/Documentation-CHN/UserGuide/5-Management/3-System log.md
deleted file mode 100644
index b7a954636930aefe7a2f548a4427aa63b7399873..0000000000000000000000000000000000000000
--- a/docs/Documentation-CHN/UserGuide/5-Management/3-System log.md
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-# 第5章 系统管理
-
-## 系统日志
-
-IoTDB支持用户通过修改日志配置文件的方式对IoTDB系统日志（如日志输出级别等）进行配置，系统日志配置文件默认位置在$IOTDB_HOME/conf文件夹下，默认的日志配置文件名为logback.xml。用户可以通过增加或更改其中的xml树型节点参数对系统运行日志的相关配置进行修改。需要说明的是，使用日志配置文件对系统日志进行配置并非修改完文件立刻生效，而是重启IoTDB系统后生效。详细配置说明参看本文日志文件配置说明。
-
-同时，为了方便在系统运行过程中运维人员对系统的调试，我们为系统运维人员提供了动态修改日志配置的JMX接口，能够在系统不重启的前提下实时对系统的Log模块进行配置。详细使用方法参看动态系统日志配置说明)。
-
-### 动态系统日志配置说明
-
-#### 连接JMX
-
-本节以Jconsole为例介绍连接JMX并进入动态系统日志配置模块的方法。启动Jconsole控制页面，在新建连接处建立与IoTDB Server的JMX连接（可以选择本地进程或给定IoTDB的IP及PORT进行远程连接，IoTDB的JMX服务默认运行端口为31999），如下图使用远程进程连接Localhost下运行在31999端口的IoTDB JMX服务。
-
-
-
-连接到JMX后，您可以通过MBean选项卡找到名为`ch.qos.logback.classic`的`MBean`，如下图所示。
-
-
-
-在`ch.qos.logback.classic`的MBean操作（Operations）选项中，可以看到当前动态系统日志配置支持的5种接口，您可以通过使用相应的方法，来执行相应的操作，操作页面如图。
-
-
-
-#### 动态系统日志接口说明
-
-* reloadDefaultConfiguration接口
-
-该方法为重新加载默认的logback配置文件，用户可以先对默认的配置文件进行修改，然后调用该方法将修改后的配置文件重新加载到系统中，使其生效。
-
-* reloadByFileName接口
-
-该方法为加载一个指定路径的logback配置文件，并使其生效。该方法接受一个名为p1的String类型的参数，该参数为需要指定加载的配置文件路径。
-
-* getLoggerEffectiveLevel接口
-
-该方法为获取指定Logger当前生效的日志级别。该方法接受一个名为p1的String类型的参数，该参数为指定Logger的名称。该方法返回指定Logger当前生效的日志级别。
-
-* getLoggerLevel接口
-
-该方法为获取指定Logger的日志级别。该方法接受一个名为p1的String类型的参数，该参数为指定Logger的名称。该方法返回指定Logger的日志级别。
-
-需要注意的是，该方法与`getLoggerEffectiveLevel`方法的区别在于，该方法返回的是指定Logger在配置文件中被设定的日志级别，如果用户没有对该Logger进行日志级别的设定，则返回空。按照Logback的日志级别继承机制，如果一个Logger没有被显示地设定日志级别，其将会从其最近的祖先继承日志级别的设定。这时，调用`getLoggerEffectiveLevel`方法将返回该Logger生效的日志级别；而调用本节所述方法，将返回空。
diff --git a/docs/Documentation-CHN/UserGuide/4-Operation Manual/2-Data Model Selection.md b/docs/Documentation-CHN/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
similarity index 61%
rename from docs/Documentation-CHN/UserGuide/4-Operation Manual/2-Data Model Selection.md
rename to docs/Documentation-CHN/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
index 603eb7af4e5a5750406bbc5a7479e6707ed12e8e..42a1d3b985e8f4f29d84329a5c9abd753d147acb 100644
--- a/docs/Documentation-CHN/UserGuide/4-Operation Manual/2-Data Model Selection.md
+++ b/docs/Documentation-CHN/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
@@ -19,32 +19,12 @@
-->
-# 第4章 IoTDB操作指南
-
-## 样例数据
-
-我们为您提供一份简化的[样例数据](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt)。
-
-下载文件: [IoTDB-SampleData.txt](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt).
-
-
-## 数据模型选用与创建
-
-在向IoTDB导入数据之前，首先要根据样例数据选择合适的数据存储模型，然后使用[SET STORAGE GROUP](/#/Documents/progress/chap4/sec7)语句和[CREATE TIMESERIES](/#/Documents/progress/chap4/sec7)语句设置存储组，并创建时间序列。
-
-### 选用存储模型
-
-根据本文描述的[数据](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt)属性层级，按照属性涵盖范围以及它们之间的从属关系，我们可将其表示为如下图3.1的属性层级组织结构，其层级关系为：集团层-电场层-设备层-传感器层。其中ROOT为根节点，传感器层的每一个节点称为叶子节点。在使用IoTDB的过程中，您可以直接将由ROOT节点到每一个叶子节点路径上的属性用“.”连接，将其作为一个IoTDB的时间序列的名称。图3.1中最左侧的路径可以生成一个名为`ROOT.ln.wf01.wt01.status`的时间序列。
-
-
-
-**图3.1 属性层级组织结构**
+
+### 配置参数
+
+配置文件位置：conf/iotdb-engine.properties
+
+
+
+**属性**
+
+1. EnableStat：是否开启性能监控模块，如果被设置为true，则性能监控模块会记录每个操作的耗时并打印结果。这个参数不能直接通过jconsole直接更改，但可通过下方的函数来进行动态设置。
+2. DisplayIntervalInMs：相邻两次打印结果的时间间隔。这个参数可以直接设置，但它要等性能监控模块重启才会生效。重启性能监控模块可以通过先调用 stopStatistic()然后调用startContinuousStatistics()或者直接调用 startOneTimeStatistics()实现。
+3. OperationSwitch：这个属性用来展示针对每一种操作是否开启了监控统计，map的键为操作的名字，值为是否针对这种操作开启性能监控。这个参数不能直接通过jconsole直接更改，但可通过下方的 'changeOperationSwitch()'函数来进行动态设置。
+
+**操作**
+
+1. startContinuousStatistics：开启性能监控并以‘DisplayIntervalInMs’的时间间隔打印统计结果。
+2. startOneTimeStatistics：开启性能监控并以‘DisplayIntervalInMs’的时间延迟打印一次统计结果。
+3. stopStatistic：关闭性能监控。
+4. clearStatisticalState(): 清除以统计的结果，从新开始统计。
+5. changeOperationSwitch(String operationName, Boolean operationState):设置是否针对每一种不同的操作开启监控。参数‘operationName是操作的名称，在OperationSwitch属性中展示了所有操作的名称。参数 ‘operationState’是操作的状态，打开或者关闭。如果状态设置成功则此函数会返回true，否则返回false。
+
+### 自定义操作类型监控其他区域
+
+**增加操作项**
+
+在org.apache.iotdb.db.cost.statistic.Operation类中增加一个枚举项来表示新增的操作.
+
+**在监控区域增加监控代码**
+
+在监控开始区域增加计时代码:
+
+ long t0 = System. currentTimeMillis();
+
+在监控结束区域增加记录代码:
+
+ Measurement.INSTANCE.addOperationLatency(Operation, t0);
+
+## cache命中率统计
+
+### 概述
+
+为了提高查询性能，IOTDB对ChunkMetaData和TsFileMetaData进行了缓存。用户可以通过debug级别的日志以及MXBean两种方式来查看缓存的命中率，并根据缓存命中率以及系统内存来调节缓存所使用的内存大小。使用MXBean查看缓存命中率的方法为：
+1. 通过端口31999连接jconsole，并在上方菜单项中选择‘MBean’.
+2. 展开侧边框并选择 'org.apache.iotdb.db.service'. 将会得到如下图所示结果：
+
+
+## 系统日志
+
+IoTDB支持用户通过修改日志配置文件的方式对IoTDB系统日志（如日志输出级别等）进行配置，系统日志配置文件默认位置在$IOTDB_HOME/conf文件夹下，默认的日志配置文件名为logback.xml。用户可以通过增加或更改其中的xml树型节点参数对系统运行日志的相关配置进行修改。详细配置说明参看本文日志文件配置说明。
+
+同时，为了方便在系统运行过程中运维人员对系统的调试，我们为系统运维人员提供了动态修改日志配置的JMX接口，能够在系统不重启的前提下实时对系统的Log模块进行配置。详细使用方法参看动态系统日志配置说明)。
+
+### 动态系统日志配置说明
+
+#### 连接JMX
+
+本节以Jconsole为例介绍连接JMX并进入动态系统日志配置模块的方法。启动Jconsole控制页面，在新建连接处建立与IoTDB Server的JMX连接（可以选择本地进程或给定IoTDB的IP及PORT进行远程连接，IoTDB的JMX服务默认运行端口为31999），如下图使用远程进程连接Localhost下运行在31999端口的IoTDB JMX服务。
+
+
+
+连接到JMX后，您可以通过MBean选项卡找到名为`ch.qos.logback.classic`的`MBean`，如下图所示。
+
+
+
+在`ch.qos.logback.classic`的MBean操作（Operations）选项中，可以看到当前动态系统日志配置支持的5种接口，您可以通过使用相应的方法，来执行相应的操作，操作页面如图。
+
+
+
+#### 动态系统日志接口说明
+
+* reloadDefaultConfiguration接口
+
+该方法为重新加载默认的logback配置文件，用户可以先对默认的配置文件进行修改，然后调用该方法将修改后的配置文件重新加载到系统中，使其生效。
+
+* reloadByFileName接口
+
+该方法为加载一个指定路径的logback配置文件，并使其生效。该方法接受一个名为p1的String类型的参数，该参数为需要指定加载的配置文件路径。
+
+* getLoggerEffectiveLevel接口
+
+该方法为获取指定Logger当前生效的日志级别。该方法接受一个名为p1的String类型的参数，该参数为指定Logger的名称。该方法返回指定Logger当前生效的日志级别。
+
+* getLoggerLevel接口
+
+该方法为获取指定Logger的日志级别。该方法接受一个名为p1的String类型的参数，该参数为指定Logger的名称。该方法返回指定Logger的日志级别。
+
+需要注意的是，该方法与`getLoggerEffectiveLevel`方法的区别在于，该方法返回的是指定Logger在配置文件中被设定的日志级别，如果用户没有对该Logger进行日志级别的设定，则返回空。按照Logback的日志级别继承机制，如果一个Logger没有被显示地设定日志级别，其将会从其最近的祖先继承日志级别的设定。这时，调用`getLoggerEffectiveLevel`方法将返回该Logger生效的日志级别；而调用本节所述方法，将返回空。
diff --git a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/1-Grafana.md b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/1-Grafana.md
similarity index 99%
rename from docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/1-Grafana.md
rename to docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/1-Grafana.md
index 51e472c31f7c5151ff8b047ca4fdf3ff552445e2..07d18179e1b20f6a4e006562086dcab3129a814a 100644
--- a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/1-Grafana.md
+++ b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/1-Grafana.md
@@ -18,7 +18,7 @@
under the License.
-->
-# 第10章: 生态集成
+# 第7章: 生态集成
## 概览
diff --git a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
similarity index 99%
rename from docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md
rename to docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
index 1293154d108ad2eaa7506e92aec8891e78613439..2ff68cf88f00127f7cd481c53320de29ffc65abb 100644
--- a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md
+++ b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
@@ -18,7 +18,7 @@
under the License.
-->
-# 第10章: 生态集成
+# 第7章: 生态集成
# TsFile的Hadoop连接器
## 概要
diff --git a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
similarity index 95%
rename from docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md
rename to docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
index 3387b083c85ecbee56d04601c3ac18cf67d03f5d..ae5dc309bd40ce2216f45d830d8de115ffe76e6e 100644
--- a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md
+++ b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
@@ -19,6 +19,6 @@
-->
-# 第10章: 生态集成
+# 第7章: 生态集成
# TsFile的Spark连接器
Coming Soon.
\ No newline at end of file
diff --git a/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
new file mode 100644
index 0000000000000000000000000000000000000000..0f0719edaca34eb099b05379055982634661a838
--- /dev/null
+++ b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
@@ -0,0 +1,23 @@
+
+# 第7章: 生态集成
+
+Coming Soon.
\ No newline at end of file
diff --git a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/5-Tsfile Hive Connector.md b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/5-Tsfile Hive Connector.md
similarity index 99%
rename from docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/5-Tsfile Hive Connector.md
rename to docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/5-Tsfile Hive Connector.md
index 18255e136c656e995acce10c2938c907bb5d7a52..a6c1a8e1db77ecef12c2ea7b0768750ad1f6ddd8 100644
--- a/docs/Documentation-CHN/UserGuide/10-Ecosystem Integration/5-Tsfile Hive Connector.md
+++ b/docs/Documentation-CHN/UserGuide/7-Ecosystem Integration/5-Tsfile Hive Connector.md
@@ -18,6 +18,7 @@
under the License.
-->
+# 第7章: 生态集成
## 概要
diff --git a/docs/Documentation-CHN/UserGuide/3-Deployment/3-Build and use IoTDB by Dockerfile.md b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/1-Hierarchy.md
similarity index 95%
rename from docs/Documentation-CHN/UserGuide/3-Deployment/3-Build and use IoTDB by Dockerfile.md
rename to docs/Documentation-CHN/UserGuide/8-System Design (Developer)/1-Hierarchy.md
index e2cec078dad6820a1d10734b90eeb412c95a4afa..6ac02553ddf0667178792e2b63f55e28196e1517 100644
--- a/docs/Documentation-CHN/UserGuide/3-Deployment/3-Build and use IoTDB by Dockerfile.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/1-Hierarchy.md
@@ -19,6 +19,6 @@
-->
-# 第3章 系统部署
+# 第8章: 系统设计
Coming Soon.
\ No newline at end of file
diff --git a/docs/Documentation-CHN/UserGuide/5-Management/4-Data Management.md b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/2-Files.md
similarity index 99%
rename from docs/Documentation-CHN/UserGuide/5-Management/4-Data Management.md
rename to docs/Documentation-CHN/UserGuide/8-System Design (Developer)/2-Files.md
index 21c459db6251fb96273a0564534954cac589ca20..1c8f38be0e28b61237157b5998b1ff4db52f0122 100644
--- a/docs/Documentation-CHN/UserGuide/5-Management/4-Data Management.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/2-Files.md
@@ -19,10 +19,9 @@
-->
-# 第5章 系统管理
+# 第8章: 系统设计
-
-## 数据管理
+## 文件
本节将介绍IoTDB的数据存储方式，便于您对IoTDB的数据管理有一个直观的了解。
diff --git a/docs/Documentation-CHN/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
similarity index 98%
rename from docs/Documentation-CHN/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md
rename to docs/Documentation-CHN/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
index 6ef719fc40a597f17180cc43c3a8cf5ee2e517bf..855fd1af7aa624f8dd8f0115052a18110ff05cb9 100644
--- a/docs/Documentation-CHN/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
@@ -19,7 +19,9 @@
-->
-# 第8章: 分布式架构
+# 第8章: 系统设计
+
+## 使用HDFS存储数据
## 存储共享架构
diff --git a/docs/Documentation-CHN/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/4-Shared Nothing Cluster.md
similarity index 97%
rename from docs/Documentation-CHN/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md
rename to docs/Documentation-CHN/UserGuide/8-System Design (Developer)/4-Shared Nothing Cluster.md
index 13fa0b70b4580683144fbdeeb0ca591527af6acb..1c0a79bfe435bf4a354a10062ef14ded3bb45bd4 100644
--- a/docs/Documentation-CHN/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md
+++ b/docs/Documentation-CHN/UserGuide/8-System Design (Developer)/4-Shared Nothing Cluster.md
@@ -19,7 +19,7 @@
-->
-# 第8章: 分布式架构
+# 第8章: 系统设计
## Shared-nothing 架构
diff --git a/docs/Documentation/UserGuide/0-Content.md b/docs/Documentation/UserGuide/0-Content.md
index c23efae870bcb31ef6114608b0caa9265d83eb2e..bb0870255cfccad2bb10ca6ef67572046b4d084b 100644
--- a/docs/Documentation/UserGuide/0-Content.md
+++ b/docs/Documentation/UserGuide/0-Content.md
@@ -18,57 +18,55 @@
under the License.
-->
-# Chapter 0: QuickStart
+
+
+# Chapter 0: Get Started
* 1-QuickStart
* 2-Frequently asked questions
-* 3-Reference
+* 3-Publication
# Chapter 1: Overview
* 1-What is IoTDB
* 2-Architecture
* 3-Scenario
* 4-Features
# Chapter 2: Concept
-* 1-Key Concepts and Terminology
-* 2-Data Type
-* 3-Encoding
-* 4-Compression
-# Chapter 3: Deployment
-* 1-Deployment
-* 2-Configuration
-* 3-Build and use IoTDB by Dockerfile
-* 4-TsFile library Intallation
-# Chapter 4: Operation Manual
-* 1-Cli Shell Tool
-* 2-Data Model Selection
-* 3-Data Import
-* 4-Data Query
-* 5-Data Maintenance
-* 6-Priviledge Management
-* 7-IoTDB Query Language
-* 8-TsFile Usage
-# Chapter 5: Management
-* 1-System Monitor
-* 2-Performance Monitor
-* 3-System log
-* 4-Data Management
-# Chapter 6: API
-* 1-JDBC API
-* 2-Session API
-* 3-Python API
-# Chapter 7: System Design
-* 1-Hierarchy
-# Chapter 8: Distributed Architecture
-* 1-Shared Storage Architecture
-* 2-Shared Nothing Architecture
-# Chapter 9: System Tools
+* 1-Data Modal and Terminology
+* 2-Data Type
+* 3-Encoding
+* 4-Compression
+# Chapter 3: Server
+* 1-Download
+* 2-Single Node Setup
+* 3-Cluster Setup
+* 4-Config Manual
+* 5-Docker Image
+# Chapter 4: Client
+* 1-Command Line Interface(CLI)
+* 2-Programming - JDBC
+* 3-Programming - Session
+* 4-Programming - Other Language
+* 5-Programming - TsFile API (TimeSeries File Format)
+# Chapter 5: Operation Manual
+* 1-DDL (Data Definition Language)
+* 2-DML (Data Manipulation Languange)
+* 3-Account Management Statements
+* 4-SQL Reference
+# Chapter 6: System Tools
* 1-Sync Tool
* 2-Memory Estimation Tool
* 3-JMX Tool
* 4-Watermark Tool
* 5-Log Visualizer
* 6-Query History Visualization Tool
-# Chapter 10: Ecosystem Integration
+* 7-Monitor and Log Tools
+# Chapter 7: Ecosystem Integration
* 1-Grafana
* 2-TsFile Hadoop Connector
* 3-TsFile Spark Connector
-* 4-Spark IoTDB Connector
\ No newline at end of file
+* 4-Spark IoTDB Connector
+* 5-Tsfile Hive Connector
+# Chapter 8: System Design (Developer)
+* 1-Hierarchy
+* 2-Files
+* 3-Writing Data on HDFS
+* 4-Shared Nothing Cluster
diff --git a/docs/Documentation/UserGuide/0-QuickStart/1-QuickStart.md b/docs/Documentation/UserGuide/0-Get Started/1-QuickStart.md
similarity index 85%
rename from docs/Documentation/UserGuide/0-QuickStart/1-QuickStart.md
rename to docs/Documentation/UserGuide/0-Get Started/1-QuickStart.md
index 34cffaefe02ba60efee72f27f02997c5eadaab1a..46396b54a19c4ce72180f2390a8a5edb653eac2c 100755
--- a/docs/Documentation/UserGuide/0-QuickStart/1-QuickStart.md
+++ b/docs/Documentation/UserGuide/0-Get Started/1-QuickStart.md
@@ -48,8 +48,7 @@ This short guide will walk you through the basic process of using IoTDB. For a m
To use IoTDB, you need to have:
1. Java >= 1.8 (Please make sure the environment path has been set)
-2. Maven >= 3.1 (If you want to compile and install IoTDB from source code)
-3. Set the max open files num as 65535 to avoid "too many open files" problem.
+2. Set the max open files num as 65535 to avoid "too many open files" problem.
## Installation
@@ -60,27 +59,14 @@ IoTDB provides you three installation methods, you can refer to the following su
* Using Docker：The path to the dockerfile is https://github.com/apache/incubator-iotdb/blob/master/docker/Dockerfile
-Here in the Quick Start, we give a brief introduction of using source code to install IoTDB. For further information, please refer to Chapter 4 of the User Guide.
+Here in the Quick Start, we give a brief introduction to install IoTDB. For further information, please refer to Chapter 3 of the User Guide.
-## Build from source
+## Download
-You can download the source code from:
+You can download the binary file from:
+[Here](https://iotdb.apache.org/#/Download)
-```
-git clone https://github.com/apache/incubator-iotdb.git
-```
-
-Under the root path of incubator-iotdb:
-
-```
-> mvn clean package -DskipTests
-```
-
-Then the binary version (including both server and client) can be found at **distribution/target/apache-iotdb-{project.version}-incubating-bin.zip**
-
-> NOTE: Directories "service-rpc/target/generated-sources/thrift" and "server/target/generated-sources/antlr3" need to be added to sources roots to avoid compilation errors in IDE.
-
-### Configurations
+## Configurations
configuration files are under "conf" folder
@@ -88,7 +74,7 @@ configuration files are under "conf" folder
* system config module (`tsfile-format.properties`, `iotdb-engine.properties`)
* log config module (`logback.xml`).
-For more, see [Chapter3: Deployment](https://iotdb.apache.org/#/Documents/progress/chap3/sec1) in detail.
+For more, see [Chapter3: Server](https://iotdb.apache.org/#/Documents/progress/chap3/sec1) in detail.
## Start
@@ -239,7 +225,7 @@ or
IoTDB> exit
```
-For more on what commands are supported by IoTDB SQL, see [IoTDB SQL Language](https://iotdb.apache.org/#/Documents/progress/chap4/sec7).
+For more on what commands are supported by IoTDB SQL, see [SQL Reference](https://iotdb.apache.org/#/Documents/progress/chap5/sec4).
### Stop IoTDB
@@ -253,16 +239,6 @@ The server can be stopped with ctrl-C or the following script:
> sbin\stop-server.bat
```
-## Only build server
-
-Under the root path of incubator-iotdb:
-
-```
-> mvn clean package -pl server -am -DskipTests
-```
-
-After build, the IoTDB server will be at the folder "server/target/iotdb-server-{project.version}".
-
## Only build client
diff --git a/docs/Documentation/UserGuide/0-QuickStart/2-Frequently asked questions.md b/docs/Documentation/UserGuide/0-Get Started/2-Frequently asked questions.md
similarity index 97%
rename from docs/Documentation/UserGuide/0-QuickStart/2-Frequently asked questions.md
rename to docs/Documentation/UserGuide/0-Get Started/2-Frequently asked questions.md
index 096e4decfa1d86f3920926ad7eeb00b53acb4700..8790cf7a34288290a8a9cc261b02f441563b9f08 100644
--- a/docs/Documentation/UserGuide/0-QuickStart/2-Frequently asked questions.md
+++ b/docs/Documentation/UserGuide/0-Get Started/2-Frequently asked questions.md
@@ -113,7 +113,7 @@ Yes. IoTDB has intense integration with Open Source Ecosystem. IoTDB supports [H
## How does IoTDB handle duplicate points?
-A data point is uniquely identified by a full time series path (e.g. ```root.vehicle.d0.s0```) and timestamp. If you submit a new point with the same path and timestamp as an existing point,
+A data point is uniquely identified by a full time series path (e.g. ```root.vehicle.d0.s0```) and timestamp. If you submit a new point with the same path and timestamp as an existing point, IoTDB will update the value of this point instead of inserting a new point.
## How can I tell what type of the specific timeseries?
diff --git a/docs/Documentation/UserGuide/0-QuickStart/3-Reference.md b/docs/Documentation/UserGuide/0-Get Started/3-Publication.md
similarity index 100%
rename from docs/Documentation/UserGuide/0-QuickStart/3-Reference.md
rename to docs/Documentation/UserGuide/0-Get Started/3-Publication.md
diff --git a/docs/Documentation/UserGuide/1-Overview/2-Architecture.md b/docs/Documentation/UserGuide/1-Overview/2-Architecture.md
index d65a722a25397ddf797eff72289c2e9acd725ea2..c03af1a7cb02f87278ad1adc86450f11109fce4a 100644
--- a/docs/Documentation/UserGuide/1-Overview/2-Architecture.md
+++ b/docs/Documentation/UserGuide/1-Overview/2-Architecture.md
@@ -27,7 +27,7 @@ Besides IoTDB engine, we also developed several components to provide better IoT
IoTDB suite can provide a series of functions in the real situation such as data collection, data writing, data storage, data query, data visualization and data analysis. Figure 1.1 shows the overall application architecture brought by all the components of the IoTDB suite.
-
+
As shown in Figure 1.1, users can use JDBC to import timeseries data collected by sensor on the device to local/remote IoTDB. These timeseries data may be system state data (such as server load and CPU memory, etc.), message queue data, timeseries data from applications, or other timeseries data in the database. Users can also write the data directly to the TsFile (local or on HDFS).
diff --git a/docs/Documentation/UserGuide/2-Concept/1-Key Concepts and Terminology.md b/docs/Documentation/UserGuide/2-Concept/1-Data Model and Terminology.md
similarity index 81%
rename from docs/Documentation/UserGuide/2-Concept/1-Key Concepts and Terminology.md
rename to docs/Documentation/UserGuide/2-Concept/1-Data Model and Terminology.md
index 5967101297e7246e060c9c4fe9119d7693f091e5..d5d08701656f9f81b199835e2f38cb3301d21063 100644
--- a/docs/Documentation/UserGuide/2-Concept/1-Key Concepts and Terminology.md
+++ b/docs/Documentation/UserGuide/2-Concept/1-Data Model and Terminology.md
@@ -20,9 +20,20 @@
-->
# Chapter 2: Concept
-## Key Concepts and Terminology
+## Data Model and Terminology
+To make this manual more practical, we will use a specific scenario example to illustrate how to operate IoTDB databases at all stages of use. See [this page](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt) for a look. For convenience, we also provide you with a sample data file in real scenario to import into the IoTDB system for trial and operation.
-The following basic concepts are involved in IoTDB:
+Download file: [IoTDB-SampleData.txt](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt).
+
+According to the data attribute layers described in [sample data](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt), we can express it as an attribute hierarchy structure based on the coverage of attributes and the subordinate relationship between them, as shown in Figure 2.1 below. Its hierarchical relationship is: power group layer - power plant layer - device layer - sensor layer. ROOT is the root node, and each node of sensor layer is called a leaf node. In the process of using IoTDB, you can directly connect the attributes on the path from ROOT node to each leaf node with ".", thus forming the name of a timeseries in IoTDB. For example, The left-most path in Figure 2.1 can generate a timeseries named `ROOT.ln.wf01.wt01.status`.
+
+
+
+**Figure 2.1 Attribute hierarchy structure**| device_1 | |||||
|---|---|---|---|---|---|
| sensor_1 | sensor_2 | sensor_3 | |||
| time | value | time | value | time | value - |
| 1 | 1.2 | 1 | 20 | 2 | 50 |
| 3 | 1.4 | 2 | 20 | 4 | 51 |
| 5 | 1.1 | 3 | 21 | 6 | 52 |
| 7 | 1.8 | 4 | 20 | 8 | 53 |
| device_1 | |||||
| sensor_1 | sensor_2 | sensor_3 | |||
| time | value | time | value | time | value + |
| 1 | 1.2 | 1 | 20 | 2 | 50 |
| 3 | 1.4 | 2 | 20 | 4 | 51 |
| 5 | 1.1 | 3 | 21 | 6 | 52 |
| 7 | 1.8 | 4 | 20 | 8 | 53 |
| device_1 | |||||
|---|---|---|---|---|---|
| sensor_1 | sensor_2 | sensor_3 | |||
| time | value | time | value | time | value - |
| 1 | 1.2 | 1 | 20 | 2 | 50 |
| 3 | 1.4 | 2 | 20 | 4 | 51 |
| 5 | 1.1 | 3 | 21 | 6 | 52 |
| 7 | 1.8 | 4 | 20 | 8 | 53 |
| device_1 | |||||
| sensor_1 | sensor_2 | sensor_3 | |||
| time | value | time | value | time | value + |
| 1 | 1.2 | 1 | 20 | 2 | 50 |
| 3 | 1.4 | 2 | 20 | 4 | 51 |
| 5 | 1.1 | 3 | 21 | 6 | 52 |
| 7 | 1.8 | 4 | 20 | 8 | 53 |
| Relationship | Description |
|---|---|
| TimeFilter.eq(value) | Choose the time equal to the value | -
| TimeFilter.lt(value) | Choose the time less than the value | -
| TimeFilter.gt(value) | Choose the time greater than the value | -
| TimeFilter.ltEq(value) | Choose the time less than or equal to the value | -
| TimeFilter.gtEq(value) | Choose the time greater than or equal to the value | -
| TimeFilter.notEq(value) | Choose the time not equal to the value | -
| TimeFilter.not(TimeFilter) | Choose the time not satisfy another TimeFilter | +
| Relationship | Description |
| TimeFilter.eq(value) | Choose the time equal to the value | +
| TimeFilter.lt(value) | Choose the time less than the value | +
| TimeFilter.gt(value) | Choose the time greater than the value | +
| TimeFilter.ltEq(value) | Choose the time less than or equal to the value | +
| TimeFilter.gtEq(value) | Choose the time greater than or equal to the value | +
| TimeFilter.notEq(value) | Choose the time not equal to the value | +
| TimeFilter.not(TimeFilter) | Choose the time not satisfy another TimeFilter |
-
-### Configuration parameter
-
-location：conf/iotdb-engine.properties
-
-
-
-**Attribute**
-
-1. EnableStat：Whether the statistics are enable or not, if it is true, the module records the time-consuming of each operation and prints the results; It can not be set dynamically but changed by function in below.
-
-2. DisplayIntervalInMs：The interval between print results. It can be set dynamically, but will take effect after restart.( First call stopStatistic(), then call startContinuousStatistics() or startOneTimeStatistics()）
-3. OperationSwitch：It's a map to indicate whether stat the operation, the key is operation name and the value is stat state. This parameter cannot be changed directly, it's change by operation 'changeOperationSwitch()'.
-
-**Operation**
-
-1. startContinuousStatistics： Start the statistics and output at interval of ‘DisplayIntervalInMs’.
-2. startOneTimeStatistics：Start the statistics and output in delay of ‘DisplayIntervalInMs’.
-3. stopStatistic：Stop the statistics.
-4. clearStatisticalState(): clear current stat result, reset statistical result.
-5. changeOperationSwitch(String operationName, Boolean operationState):set whether to monitor operation status. The param 'operationName' is the name of operation, defined in attribute operationSwitch. The param operationState is the state of operation. If state-switch successful the function will return true, else return false.
-
-### Adding Custom Monitoring Items for developer of IOTDB
-
-**Add Operation**
-
-Add an enumeration in org.apache.iotdb.db.cost.statistic.Operation.
-
-**Add Timing Code in Monitoring Area**
-
-Add timing code in the monitoring start area:
-
- long t0 = System. currentTimeMillis();
-
-Add timing code in the monitoring stop area:
-
- Measurement.INSTANCE.addOperationLatency(Operation, t0);
-
-## Cache Hit Ratio Statistics
-
-### Overview
-
-To improve query performance, IOTDB caches ChunkMetaData and TsFileMetaData. Users can view the cache hit rate through debug level log and MXBean, and adjust the memory occupied by the cache according to the cache hit rate and system memory. The method of using MXBean to view cache hit ratio is as follows:
-1. Connect to jconsole with port 31999 and select 'MBean' in the menu item above.
-2. Expand the sidebar and select 'org.apache.iotdb.db.service'. You will get the results shown in the following figure:
-
-
\ No newline at end of file
diff --git a/docs/Documentation/UserGuide/5-Management/3-System log.md b/docs/Documentation/UserGuide/5-Management/3-System log.md
deleted file mode 100644
index d945a0eadd7d0cac3182c7812b2278728fea664e..0000000000000000000000000000000000000000
--- a/docs/Documentation/UserGuide/5-Management/3-System log.md
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-# Chapter 5: Management
-
-## System log
-
-IoTDB allows users to configure IoTDB system logs (such as log output level) by modifying the log configuration file. The default location of the system log configuration file is in \$IOTDB_HOME/conf folder.
-
-The default log configuration file is named logback.xml. The user can modify the configuration of the system running log by adding or changing the xml tree node parameters. It should be noted that the configuration of the system log using the log configuration file does not take effect immediately after the modification, instead, it will take effect after restarting the system. The usage of logback.xml is just as usual.
-
-At the same time, in order to facilitate the debugging of the system by the developers and DBAs, we provide several JMX interface to dynamically modify the log configuration, and configure the Log module of the system in real time without restarting the system. For detailed usage, see [Dynamic System Log Configuration](/#/Documents/progress/chap5/sec4) section.
-
-### Dynamic System Log Configuration
-
-#### Connect JMX
-
-Here we use JConsole to connect with JMX.
-
-Start the JConsole, establish a new JMX connection with the IoTDB Server (you can select the local process or input the IP and PORT for remote connection, the default operation port of the IoTDB JMX service is 31999). Fig 4.1 shows the connection GUI of JConsole.
-
-
-
-After connected, click `MBean` and find `ch.qos.logback.classic.default.ch.qos.logback.classic.jmx.JMXConfigurator`(As shown in fig 4.2).
-
-
-In the JMXConfigurator Window, there are 6 operation provided for you, as shown in fig 4.3. You can use there interface to perform operation.
-
-
-
-#### Interface Instruction
-
-* reloadDefaultConfiguration
-
-This method is to reload the default logback configuration file. The user can modify the default configuration file first, and then call this method to reload the modified configuration file into the system to take effect.
-
-* reloadByFileName
-
-This method loads a logback configuration file with the specified path and name, and then makes it take effect. This method accepts a parameter of type String named p1, which is the path to the configuration file that needs to be specified for loading.
-
-* getLoggerEffectiveLevel
-
-This method is to obtain the current log level of the specified Logger. This method accepts a String type parameter named p1, which is the name of the specified Logger. This method returns the log level currently in effect for the specified Logger.
-
-* getLoggerLevel
-
-This method is to obtain the log level of the specified Logger. This method accepts a String type parameter named p1, which is the name of the specified Logger. This method returns the log level of the specified Logger.
-It should be noted that the difference between this method and the `getLoggerEffectiveLevel` method is that the method returns the log level that the specified Logger is set in the configuration file. If the user does not set the log level for the Logger. , then return empty. According to Logre's log-level inheritance mechanism, if a Logger is not displayed to set the log level, it will inherit the log level settings from its nearest ancestor. At this point, calling the `getLoggerEffectiveLevel` method will return the log level in which the Logger is in effect; calling the methods described in this section will return null.
diff --git a/docs/Documentation/UserGuide/4-Operation Manual/2-Data Model Selection.md b/docs/Documentation/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
similarity index 56%
rename from docs/Documentation/UserGuide/4-Operation Manual/2-Data Model Selection.md
rename to docs/Documentation/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
index 72fa87bddd4aa0b5153a85b42e7a9db5d1d6dfa9..85b27ba6e69ccc14a26fec3a26688e74cc5fc9cb 100644
--- a/docs/Documentation/UserGuide/4-Operation Manual/2-Data Model Selection.md
+++ b/docs/Documentation/UserGuide/5-Operation Manual/1-DDL (Data Definition Language).md
@@ -19,29 +19,11 @@
-->
-# Chapter 4: Operation Manual
+# Chapter 5: Operation Manual
+# DDL (Data Definition Language)
-## Sample Data
-
-To make this manual more practical, we will use a specific scenario example to illustrate how to operate IoTDB databases at all stages of use. See [this page](https://github.com/apache/incubator-iotdb/blob/master/docs/Documentation/OtherMaterial-Sample%20Data.txt) for a look. For your convenience, we also provide you with a sample data file in real scenario to import into the IoTDB system for trial and operation.
-
-Download file: [IoTDB-SampleData.txt](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt).
-
-## Data Model Selection
-
-Before importing data to IoTDB, we first select the appropriate data storage model according to the [sample data](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt), and then create the storage group and timeseries using [SET STORAGE GROUP](/#/Documents/progress/chap4/sec7) statement and [CREATE TIMESERIES](/#/Documents/progress/chap4/sec7) statement respectively.
-
-### Storage Model Selection
-According to the data attribute layers described in [sample data](https://raw.githubusercontent.com/apache/incubator-iotdb/master/docs/Documentation/OtherMaterial-Sample%20Data.txt), we can express it as an attribute hierarchy structure based on the coverage of attributes and the subordinate relationship between them, as shown in Figure 3.1 below. Its hierarchical relationship is: power group layer - power plant layer - device layer - sensor layer. ROOT is the root node, and each node of sensor layer is called a leaf node. In the process of using IoTDB, you can directly connect the attributes on the path from ROOT node to each leaf node with ".", thus forming the name of a timeseries in IoTDB. For example, The left-most path in Figure 3.1 can generate a timeseries named `ROOT.ln.wf01.wt01.status`.
-
-
-
-**Figure 3.1 Attribute hierarchy structure**
-**Figure 4.2 The actual meanings of the three types of parameters**
+
+### Configuration parameter
+
+location：conf/iotdb-engine.properties
+
+
+
+**Attribute**
+
+1. EnableStat：Whether the statistics are enabled or not, if it is true, the module records the time-consuming of each operation and prints the results; It is non-editable but can be changed by the function below.
+
+2. DisplayIntervalInMs：The interval between print results. The changes will not take effect instantly. To make the changes effective, you should call startContinuousStatistics() or startOneTimeStatistics().
+3. OperationSwitch：It's a map to indicate whether the statistics of one kind of operation should be computed, the key is operation name and the value is true means the statistics of the operation are enabled, otherwise disabled. This parameter cannot be changed directly, it's changed by operation 'changeOperationSwitch()'.
+
+**Operation**
+
+1. startContinuousStatistics： Start the statistics and output at interval of ‘DisplayIntervalInMs’.
+2. startOneTimeStatistics：Start the statistics and output in delay of ‘DisplayIntervalInMs’.
+3. stopStatistic：Stop the statistics.
+4. clearStatisticalState(): clear current stat result, reset statistical result.
+5. changeOperationSwitch(String operationName, Boolean operationState):set whether to monitor a kind of operation. The param 'operationName' is the name of operation, defined in attribute operationSwitch. The param operationState is whether to enable the statistics or not. If the state is switched successfully, the function will return true, else return false.
+
+### Adding Custom Monitoring Items for contributors of IOTDB
+
+**Add Operation**
+
+Add an enumeration in org.apache.iotdb.db.cost.statistic.Operation.
+
+**Add Timing Code in Monitoring Area**
+
+Add timing code in the monitoring start area:
+
+ long t0 = System. currentTimeMillis();
+
+Add timing code in the monitoring stop area:
+
+ Measurement.INSTANCE.addOperationLatency(Operation, t0);
+
+## Cache Hit Ratio Statistics
+
+### Overview
+
+To improve query performance, IOTDB caches ChunkMetaData and TsFileMetaData. Users can view the cache hit ratio through debug level log and MXBean, and adjust the memory occupied by the cache according to the cache hit ratio and system memory. The method of using MXBean to view cache hit ratio is as follows:
+1. Connect to jconsole with port 31999 and select 'MBean' in the menu item above.
+2. Expand the sidebar and select 'org.apache.iotdb.db.service'. You will get the results shown in the following figure:
+
+
+## System log
+
+IoTDB allows users to configure IoTDB system logs (such as log output level) by modifying the log configuration file. The default location of the system log configuration file is in \$IOTDB_HOME/conf folder.
+
+The default log configuration file is named logback.xml. The user can modify the configuration of the system running log by adding or changing the xml tree node parameters. It should be noted that the configuration of the system log using the log configuration file does not take effect immediately after the modification, instead, it will take effect after restarting the system. The usage of logback.xml is just as usual.
+
+At the same time, in order to facilitate the debugging of the system by the developers and DBAs, we provide several JMX interfaces to dynamically modify the log configuration, and configure the Log module of the system in real time without restarting the system.
+
+### Dynamic System Log Configuration
+
+#### Connect JMX
+
+Here we use JConsole to connect with JMX.
+
+Start the JConsole, establish a new JMX connection with the IoTDB Server (you can select the local process or input the IP and PORT for remote connection, the default operation port of the IoTDB JMX service is 31999). Fig 4.1 shows the connection GUI of JConsole.
+
+
+
+After connected, click `MBean` and find `ch.qos.logback.classic.default.ch.qos.logback.classic.jmx.JMXConfigurator`(As shown in fig 4.2).
+
+
+In the JMXConfigurator Window, there are 6 operations provided for you, as shown in fig 4.3. You can use there interfaces to perform operation.
+
+
+
+#### Interface Instruction
+
+* reloadDefaultConfiguration
+
+This method is to reload the default logback configuration file. The user can modify the default configuration file first, and then call this method to reload the modified configuration file into the system to take effect.
+
+* reloadByFileName
+
+This method loads a logback configuration file with the specified path and name, and then makes it take effect. This method accepts a parameter of type String named p1, which is the path to the configuration file that needs to be specified for loading.
+
+* getLoggerEffectiveLevel
+
+This method is to obtain the current log level of the specified Logger. This method accepts a String type parameter named p1, which is the name of the specified Logger. This method returns the log level currently in effect for the specified Logger.
+
+* getLoggerLevel
+
+This method is to obtain the log level of the specified Logger. This method accepts a String type parameter named p1, which is the name of the specified Logger. This method returns the log level of the specified Logger.
+It should be noted that the difference between this method and the `getLoggerEffectiveLevel` method is that the method returns the log level that the specified Logger is set in the configuration file. If the user does not set the log level for the Logger. , then return empty. According to Logger's log-level inheritance mechanism, f a Logger's level is not explicitly set, it will inherit the log level settings from its nearest ancestor. At this point, calling the `getLoggerEffectiveLevel` method will return the log level in which the Logger is in effect; calling `getLoggerLevel` will return null.
+
diff --git a/docs/Documentation/UserGuide/10-Ecosystem Integration/1-Grafana.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/1-Grafana.md
similarity index 98%
rename from docs/Documentation/UserGuide/10-Ecosystem Integration/1-Grafana.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/1-Grafana.md
index 973bf56577abb349ceed871eecb841169b95e139..b463ac8c21a3f5bf3b5c19b41becb8ecd1dbddaf 100644
--- a/docs/Documentation/UserGuide/10-Ecosystem Integration/1-Grafana.md
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/1-Grafana.md
@@ -18,7 +18,7 @@
under the License.
-->
-# Chapter 10: Ecosystem Integration
+# Chapter 7: Ecosystem Integration
# Grafana
## Outline
diff --git a/docs/Documentation/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
similarity index 99%
rename from docs/Documentation/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
index dfbf321c83c9b41f8413d16a3da0715ecd8160b2..9a6834bb0f3cd1521b415089e1b9a7b4c45865de 100644
--- a/docs/Documentation/UserGuide/10-Ecosystem Integration/2-TsFile Hadoop Connector.md
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/2-TsFile Hadoop Connector.md
@@ -18,7 +18,7 @@
under the License.
-->
-# Chapter 10: Ecosystem Integration
+# Chapter 7: Ecosystem Integration
# TsFile-Hadoop-Connector
## Outline
diff --git a/docs/Documentation/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
similarity index 99%
rename from docs/Documentation/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
index 569b2cc44dab0f805731dd5758c365f1596ecb38..261cf09fce75cfb604210045050e70b16314bb79 100644
--- a/docs/Documentation/UserGuide/10-Ecosystem Integration/3-TsFile Spark Connector.md
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/3-TsFile Spark Connector.md
@@ -19,7 +19,7 @@
-->
-# Chapter 10: Ecosystem Integration
+# Chapter 7: Ecosystem Integration
# TsFile-Spark-Connector User Guide
diff --git a/docs/Documentation/UserGuide/10-Ecosystem Integration/4-Spark IoTDB Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
similarity index 99%
rename from docs/Documentation/UserGuide/10-Ecosystem Integration/4-Spark IoTDB Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
index 06059f795748e07531b031108c384136faef439c..4d7aa1903abdcc4f1a6566ba2e6a606496d096d9 100644
--- a/docs/Documentation/UserGuide/10-Ecosystem Integration/4-Spark IoTDB Connector.md
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/4-Spark IoTDB Connector.md
@@ -18,7 +18,7 @@
under the License.
-->
-# Chapter 10: Ecosystem Integration
+# Chapter 7: Ecosystem Integration
# Spark IoTDB Connecter
## version
diff --git a/docs/Documentation/UserGuide/10-Ecosystem Integration/5-TsFile Hive Connector.md b/docs/Documentation/UserGuide/7-Ecosystem Integration/5-TsFile Hive Connector.md
similarity index 99%
rename from docs/Documentation/UserGuide/10-Ecosystem Integration/5-TsFile Hive Connector.md
rename to docs/Documentation/UserGuide/7-Ecosystem Integration/5-TsFile Hive Connector.md
index 3f5af495f0c0d2d40cd52d08504e06a77b2cf3c5..97e5ebdbf82d2af8e9da1765ce66c7261bfe3508 100644
--- a/docs/Documentation/UserGuide/10-Ecosystem Integration/5-TsFile Hive Connector.md
+++ b/docs/Documentation/UserGuide/7-Ecosystem Integration/5-TsFile Hive Connector.md
@@ -18,7 +18,7 @@
under the License.
-->
-
+# Chapter 7: Ecosystem Integration
## Outline
diff --git a/docs/Documentation/UserGuide/7-System Design/1-Hierarchy.md b/docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
similarity index 99%
rename from docs/Documentation/UserGuide/7-System Design/1-Hierarchy.md
rename to docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
index e176157ce527f11a4285ec6894def0537c55c038..c8e85abf012c2328b430e900ddc88e20738937ae 100644
--- a/docs/Documentation/UserGuide/7-System Design/1-Hierarchy.md
+++ b/docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
@@ -19,7 +19,7 @@
-->
-# Chapter 7: System Design
+# Chapter 8: System Design (Developer)
## TsFile Hierarchy
diff --git a/docs/Documentation/UserGuide/5-Management/4-Data Management.md b/docs/Documentation/UserGuide/8-System Design (Developer)/2-Files.md
similarity index 97%
rename from docs/Documentation/UserGuide/5-Management/4-Data Management.md
rename to docs/Documentation/UserGuide/8-System Design (Developer)/2-Files.md
index 7a3d6e15256fb196d98f49e9b50291a88da4394e..75f3162f5ba56214136313d5421449050d811128 100644
--- a/docs/Documentation/UserGuide/5-Management/4-Data Management.md
+++ b/docs/Documentation/UserGuide/8-System Design (Developer)/2-Files.md
@@ -19,10 +19,9 @@
-->
-# Chapter 5: Management
+# Chapter 8: System Design (Developer)
-
-## Data Management
+## Files
In IoTDB, there are many kinds of data needed to be storage. In this section, we will introduce IoTDB's data storage strategy in order to give you an intuitive understanding of IoTDB's data management.
diff --git a/docs/Documentation/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md b/docs/Documentation/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
similarity index 98%
rename from docs/Documentation/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md
rename to docs/Documentation/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
index c2ffcc773405ace3cd114854966f98dad7913a7c..cfdb8e710db2b5bb8b8ac13948e5a1faa35c2bbe 100644
--- a/docs/Documentation/UserGuide/8-Distributed Architecture/1-Shared Storage Architecture.md
+++ b/docs/Documentation/UserGuide/8-System Design (Developer)/3-Writing Data on HDFS.md
@@ -19,7 +19,9 @@
-->
-# Chapter 8: Distributed Architecture
+# Chapter 8: System Design (Developer)
+
+# Writing Data on HDFS
## Shared Storage Architecture
diff --git a/docs/Documentation/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md b/docs/Documentation/UserGuide/8-System Design (Developer)/4-Shard Nothing Cluster.md
similarity index 94%
rename from docs/Documentation/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md
rename to docs/Documentation/UserGuide/8-System Design (Developer)/4-Shard Nothing Cluster.md
index 4ebcb2c6562ea7a749922cecb7cf309e1124a7e6..c93793c852ce1ec7ea11e536938b49c1eb8c659b 100644
--- a/docs/Documentation/UserGuide/8-Distributed Architecture/2-Shared Nothing Architecture.md
+++ b/docs/Documentation/UserGuide/8-System Design (Developer)/4-Shard Nothing Cluster.md
@@ -19,7 +19,7 @@
-->
-# Chapter 8: Distributed Architecture
+# Chapter 8: System Design (Developer)
## Shared Nothing Architecture