You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/06/23 02:08:18 UTC
[iotdb] branch master updated: Update TSDB-comparison doc and
`Merge` command doc (#3233)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 294f1e7 Update TSDB-comparison doc and `Merge` command doc (#3233)
294f1e7 is described below
commit 294f1e704926100de33f921b6e6d0e9da13439a6
Author: zhanglingzhe0820 <44...@qq.com>
AuthorDate: Wed Jun 23 10:07:54 2021 +0800
Update TSDB-comparison doc and `Merge` command doc (#3233)
Co-authored-by: zhanglingzhe <su...@foxmail.com>
Co-authored-by: Haonan <hh...@outlook.com>
---
docs/UserGuide/Comparison/TSDB-Comparison.md | 14 ++++++++++----
docs/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md | 6 +++---
.../zh/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md | 6 +++---
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/docs/UserGuide/Comparison/TSDB-Comparison.md b/docs/UserGuide/Comparison/TSDB-Comparison.md
index 919a4e2..007fa35 100644
--- a/docs/UserGuide/Comparison/TSDB-Comparison.md
+++ b/docs/UserGuide/Comparison/TSDB-Comparison.md
@@ -308,6 +308,10 @@ We test the performance of writing from two aspects: *batch size* and *client nu
10 clients read data concurrently. The number of storage group is 10. There are 10 devices and each device has 10 measurements (i.e.,, 100 time series total).
The data type is *double*, encoding type is *GORILLA*
+* Compression:
+
+We test and compare file sizes of TsFile(the file format of IoTDB) and some others famous dataset formats, which are Parquet, ORC and Csv, after the same datasets are written.
+
The IoTDB version is v0.11.1.
**Write performance**:
@@ -315,17 +319,17 @@ The IoTDB version is v0.11.1.
* batch size:
10 clients write data concurrently.
-IoTDB uses batch insertion API and the batch size is distributed from 1ms to 1min (write N data points per write API call).
+IoTDB uses batch insertion API and the batch size is distributed from 0 to 6000 (write N data points per write API call).
The write throughput (points/second) is:
-
+
<span id = "exp1"> <center>Figure 1. Batch Size with Write throughput (points/second) IoTDB v0.11.1</center></span>
The write delay (ms) is:
-
+
<center>Figure 2. Batch Size with Write Delay (ms) IoTDB v0.11.1</center>
* client num:
@@ -352,8 +356,10 @@ The write throughput (points/second) is:
<center>Figure 7. Latest query time cost(ms) IoTDB v0.11.1</center>
-We can see that IoTDB outperforms others.
+
+<center>Figure 8. Data compression IoTDB v0.11.1</center>
+We can see that IoTDB outperforms others.
#### More details
diff --git a/docs/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md b/docs/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
index 80e6524..8adf34a 100644
--- a/docs/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
+++ b/docs/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
@@ -32,10 +32,10 @@ IoTDB> FLUSH root.sg1,root.sg2
## MERGE
-Merge sequence and unsequence data. Currently IoTDB supports the following two types of SQL to manually trigger the merge process of data files:
+Execute Level Compaction and unsequence Compaction task. Currently IoTDB supports the following two types of SQL to manually trigger the compaction process of data files:
-* `MERGE` Only rewrite overlapped Chunks, the merge speed is quick, while there will be redundant data on the disk eventually.
-* `FULL MERGE` Rewrite all data in overlapped files, the merge speed is slow, but there will be no redundant data on the disk eventually.
+* `MERGE` Execute the level compaction first and then execute the unsequence compaction. In unsequence compaction process, this command is executed very fast by rewriting the overlapped Chunks only, while there is some redundant data on the disk eventually.
+* `FULL MERGE` Execute the level compaction first and then execute the unsequence compaction. In unsequence compaction process, this command is executed slow due to it takes more time to rewrite all data in overlapped files. However, there won't be any redundant data on the disk eventually.
```
IoTDB> MERGE
diff --git a/docs/zh/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md b/docs/zh/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
index 21c8d73..192f6a0 100644
--- a/docs/zh/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
+++ b/docs/zh/UserGuide/IoTDB-SQL-Language/Maintenance-Command.md
@@ -32,10 +32,10 @@ IoTDB> FLUSH root.sg1,root.sg2
## MERGE
-合并顺序和乱序数据。当前IoTDB支持使用如下两种SQL手动触发数据文件的合并：
+触发层级合并和乱序合并。当前IoTDB支持使用如下两种SQL手动触发数据文件的合并：
-* `MERGE` 仅重写重复的Chunk，整理速度快，但是最终磁盘会存在多余数据。
-* `FULL MERGE` 将需要合并的顺序和乱序文件的所有数据都重新写一份，整理速度慢，最终磁盘将不存在无用的数据。
+* `MERGE` 先触发层级合并，等层级合并执行完后，再触发乱序合并。在乱序合并中，仅重写重复的Chunk，整理速度快，但是最终磁盘会存在多余数据。
+* `FULL MERGE` 先触发层级合并，等层级合并执行完后，再触发乱序合并。在乱序合并中，将需要合并的顺序和乱序文件的所有数据都重新写一份，整理速度慢，最终磁盘将不存在无用的数据。
```
IoTDB> MERGE