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 2023/04/04 03:26:12 UTC
[iotdb] branch master updated: Update markdown table format and benchmark link address (#9520)
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 d7bda4a7ef Update markdown table format and benchmark link address (#9520)
d7bda4a7ef is described below
commit d7bda4a7ef6ab13f0a00498fd9488ae3ce4f8dff
Author: 肖志红 <73...@users.noreply.github.com>
AuthorDate: Tue Apr 4 11:26:07 2023 +0800
Update markdown table format and benchmark link address (#9520)
* Update markdown table format in Spark-TsFile.md
* Update benchmark link address
* Update Spark-TsFile.md
---
.../Ecosystem-Integration/Spark-TsFile.md | 2 +-
.../Ecosystem-Integration/Spark-TsFile.md | 24 +++++++++++-----------
.../zh/UserGuide/IoTDB-Introduction/Publication.md | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/docs/UserGuide/Ecosystem-Integration/Spark-TsFile.md b/docs/UserGuide/Ecosystem-Integration/Spark-TsFile.md
index 3278f31df9..a0f52c4f11 100644
--- a/docs/UserGuide/Ecosystem-Integration/Spark-TsFile.md
+++ b/docs/UserGuide/Ecosystem-Integration/Spark-TsFile.md
@@ -254,7 +254,7 @@ Two columns are created to store the full path of the device: time(LongType) and
Next, a column is created for each Measurement to store the specific data. The SparkSQL table structure is:
-|time(LongType)| delta\_object(StringType)|status(BooleanType)|temperature(FloatType)|hardware(StringType)|
+|time(LongType)|delta\_object(StringType)|status(BooleanType)|temperature(FloatType)|hardware(StringType)|
|---|---|---|---|---|
|1| root.ln.wf01.wt01 |True|2.2|null|
|1| root.ln.wf02.wt02 |True|null|null|
diff --git a/docs/zh/UserGuide/Ecosystem-Integration/Spark-TsFile.md b/docs/zh/UserGuide/Ecosystem-Integration/Spark-TsFile.md
index 8147aa4922..9ac8aae76b 100644
--- a/docs/zh/UserGuide/Ecosystem-Integration/Spark-TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem-Integration/Spark-TsFile.md
@@ -88,18 +88,18 @@ TsFile-Spark-Connector 对 Tsfile 类型的外部数据源实现 Spark 的支持
| ---- | ---- | ---- |
|状态 | Boolean|PLAIN|
|温度 | Float|RLE|
-|硬件|Text|PLAIN|
+|硬件 |Text|PLAIN|
TsFile 中的现有数据如下:
* d1:root.ln.wf01.wt01
* d2:root.ln.wf02.wt02
-time|d1.status|time|d1.temperature |time | d2.hardware |time|d2.status
----- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ----
-1|True |1|2.2|2|"aaa"|1|True
-3|True |2|2.2|4|"bbb"|2|False
-5|False|3 |2.1|6 |"ccc"|4|True
+| time | d1.status | time | d1.temperature | time | d2.hardware | time | d2.status |
+| :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- |
+| 1 | True | 1 | 2.2 | 2 | "aaa" | 1 | True |
+| 3 | True | 2 | 2.2 | 4 | "bbb" | 2 | False |
+| 5 | False | 3 | 2.1 | 6 | "ccc" | 4 | True |
相应的 SparkSQL 表如下:
@@ -243,12 +243,12 @@ newDf.show
* delta_object2: root.ln.wf02.wt02
* delta_object3: :root.sgcc.wf03.wt01
-time|delta_object1.status|time|delta_object1.temperature |time | delta_object2.hardware |time|delta_object2.status |time|delta_object3.status|time|delta_object3.temperature
----- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ----
-1|True |1|2.2|2|"aaa"|1|True|2|True|3|3.3
-3|True |2|2.2|4|"bbb"|2|False|3|True|6|6.6
-5|False|3 |2.1|6 |"ccc"|4|True|4|True|8|8.8
-7|True|4|2.0|8|"ddd"|5|False|6|True|9|9.9
+| time | delta_object1.status | time | delta_object1.temperature | time | delta_object2.hardware | time | delta_object2.status | time | delta_object3.status | time | delta_object3.temperature |
+| :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- |
+| 1 | True | 1 | 2.2 | 2 | "aaa" | 1 | True | 2 | True | 3 | 3.3 |
+| 3 | True | 2 | 2.2 | 4 | "bbb" | 2 | False | 3 | True | 6 | 6.6 |
+| 5 | False| 3 | 2.1 | 6 | "ccc" | 4 | True | 4 | True | 8 | 8.8 |
+| 7 | True | 4 | 2.0 | 8 | "ddd" | 5 | False | 6 | True | 9 | 9.9 |
有两种显示方法:
diff --git a/docs/zh/UserGuide/IoTDB-Introduction/Publication.md b/docs/zh/UserGuide/IoTDB-Introduction/Publication.md
index 60efee90c4..555a09d43a 100644
--- a/docs/zh/UserGuide/IoTDB-Introduction/Publication.md
+++ b/docs/zh/UserGuide/IoTDB-Introduction/Publication.md
@@ -36,4 +36,4 @@ Apache IoTDB 始于清华大学软件学院。IoTDB 是一个用于管理大量
我们还研发了面向时间序列数据库的 Benchmark 工具:
-https://github.com/thulab/iotdb-benchmark
+[https://github.com/thulab/iot-benchmark](https://github.com/thulab/iot-benchmark)