You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/06/10 09:08:42 UTC
[incubator-iotdb] branch rel/0.10 updated (978890a -> 8d7aaec)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 978890a [IOTDB-755] Fix count bug. Cherry Pick to rel/0.10 (#1336)
new b17f25f fix doc for releasing v0.10
new be91d77 keep consistent with rpc-changelist.md
new 8d7aaec change start-client.sh to start-cli.sh in doc
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
README_ZH.md | 2 +-
docs/Development/VoteRelease.md | 2 +-
docs/UserGuide/Ecosystem Integration/Spark TsFile.md | 2 +-
docs/UserGuide/Server/Docker Image.md | 8 ++++----
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +-
docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md | 2 +-
docs/zh/UserGuide/Server/Docker Image.md | 8 ++++----
service-rpc/rpc-changelist.md | 4 ++--
tsfile/format-changelist.md | 4 ++--
11 files changed, 19 insertions(+), 19 deletions(-)
[incubator-iotdb] 03/03: change start-client.sh to start-cli.sh in
doc
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8d7aaeca127ee7c322ba1df802ffd293537645d6
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jun 10 16:56:17 2020 +0800
change start-client.sh to start-cli.sh in doc
---
docs/Development/VoteRelease.md | 2 +-
docs/UserGuide/Server/Docker Image.md | 6 +++---
docs/zh/Development/VoteRelease.md | 2 +-
docs/zh/UserGuide/Server/Docker Image.md | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/Development/VoteRelease.md b/docs/Development/VoteRelease.md
index b7598e5..a244500 100644
--- a/docs/Development/VoteRelease.md
+++ b/docs/Development/VoteRelease.md
@@ -132,7 +132,7 @@ Compared with the corresponding .sha512, the same is fine.
```
nohup ./sbin/start-server.sh >/dev/null 2>&1 &
-./sbin/start-client.sh
+./sbin/start-cli.sh
SET STORAGE GROUP TO root.turbine;
CREATE TIMESERIES root.turbine.d1.s0 WITH DATATYPE=DOUBLE, ENCODING=GORILLA;
diff --git a/docs/UserGuide/Server/Docker Image.md b/docs/UserGuide/Server/Docker Image.md
index 2cc68fe..f9e1928 100644
--- a/docs/UserGuide/Server/Docker Image.md
+++ b/docs/UserGuide/Server/Docker Image.md
@@ -65,16 +65,16 @@ suppose the IP is <C_IP>.
4. If you just want to have a try by using iotdb-cli, you can:
```
$ docker exec -it /bin/bash <C_ID>
-$ (now you have enter the container): /cli/sbin/start-client.sh -h localhost -p 6667 -u root -pw root
+$ (now you have enter the container): /cli/sbin/start-cli.sh -h localhost -p 6667 -u root -pw root
```
Or, run a new docker container as the client:
```
-$ docker run -it iotdb:base /cli/sbin/start-client.sh -h <C_IP> -p 6667 -u root -pw root
+$ docker run -it iotdb:base /cli/sbin/start-cli.sh -h <C_IP> -p 6667 -u root -pw root
```
Or, if you have a iotdb-cli locally (e.g., you have compiled the source code by `mvn package`), and suppose your work_dir is cli/bin, then you can just run:
```
-$ start-client.sh -h localhost -p 6667 -u root -pw root
+$ start-cli.sh -h localhost -p 6667 -u root -pw root
```
5. If you want to write codes to insert data and query data, please add the following dependence:
```xml
diff --git a/docs/zh/Development/VoteRelease.md b/docs/zh/Development/VoteRelease.md
index 107064c..ffeec96 100644
--- a/docs/zh/Development/VoteRelease.md
+++ b/docs/zh/Development/VoteRelease.md
@@ -132,7 +132,7 @@ shasum -a512 apache-iotdb-0.9.0-incubating-bin.zip
```
nohup ./sbin/start-server.sh >/dev/null 2>&1 &
-./sbin/start-client.sh
+./sbin/start-cli.sh
SET STORAGE GROUP TO root.turbine;
CREATE TIMESERIES root.turbine.d1.s0 WITH DATATYPE=DOUBLE, ENCODING=GORILLA;
diff --git a/docs/zh/UserGuide/Server/Docker Image.md b/docs/zh/UserGuide/Server/Docker Image.md
index 190f2db..81e3f86 100644
--- a/docs/zh/UserGuide/Server/Docker Image.md
+++ b/docs/zh/UserGuide/Server/Docker Image.md
@@ -65,16 +65,16 @@ $ docker inspect --format='{{.NetworkSettings.IPAddress}}' <C_ID>
4. 如果您想尝试使用 iotdb-cli 命令行, 您可以使用如下命令:
```
$ docker exec -it /bin/bash <C_ID>
-$ (now you have enter the container): /cli/sbin/start-client.sh -h localhost -p 6667 -u root -pw root
+$ (now you have enter the container): /cli/sbin/start-cli.sh -h localhost -p 6667 -u root -pw root
```
或者运行一个新的 client docker container，命令如下:
```
-$ docker run -it iotdb:base /cli/sbin/start-client.sh -h <C_IP> -p 6667 -u root -pw root
+$ docker run -it iotdb:base /cli/sbin/start-cli.sh -h <C_IP> -p 6667 -u root -pw root
```
还可以使用本地的 iotdb-cli (比如：您已经使用`mvn package`编译过源码), 假设您的 work_dir 是 cli/bin, 那么您可以直接运行:
```
-$ start-client.sh -h localhost -p 6667 -u root -pw root
+$ start-cli.sh -h localhost -p 6667 -u root -pw root
```
5. 如果您想写一些代码来插入或者查询数据，您可以在 pom.xml 文件中加入下面的依赖:
```xml
[incubator-iotdb] 02/03: keep consistent with rpc-changelist.md
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit be91d7739acd6333679c687d97da41dd24422a9d
Author: Xiangdong Huang <hu...@tsinghua.edu.cn>
AuthorDate: Wed Jun 10 15:54:08 2020 +0800
keep consistent with rpc-changelist.md
---
tsfile/format-changelist.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tsfile/format-changelist.md b/tsfile/format-changelist.md
index d9a07d7..fe1b269 100644
--- a/tsfile/format-changelist.md
+++ b/tsfile/format-changelist.md
@@ -20,7 +20,7 @@
-->
-# version-1 (0.9.x) -> version-2 (0.10.x)
+# 0.9.x (version-1) -> 0.10.x (version-2)
Last Updated on 2019-11-28 by Jialin Qiao.
@@ -33,7 +33,7 @@ Last Updated on 2019-11-28 by Jialin Qiao.
| 1047 | [IOTDB-593] Add metaOffset in TsFileMetadata | qiaojialin | Add metaOffset in TsFileMetadata |
| 1100 | [IOTDB-605] Add more levels of index in TsFileMetadata | sunzesong | Update the structure of deviceMetadata to a tree-level indexed TsFileMetadata |
-# 0.8.0 -> version-1 (0.9.x)
+# 0.8.0 -> 0.9.x (version-1)
Last Updated on 2019-10-27 by Lei Rui.
[incubator-iotdb] 01/03: fix doc for releasing v0.10
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b17f25fa3e884adda3d9cb9c9d463119abde1717
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jun 10 15:32:18 2020 +0800
fix doc for releasing v0.10
---
README.md | 2 +-
README_ZH.md | 2 +-
docs/UserGuide/Ecosystem Integration/Spark TsFile.md | 2 +-
docs/UserGuide/Server/Docker Image.md | 2 +-
docs/zh/UserGuide/Client/Programming - JDBC.md | 2 +-
docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md | 2 +-
docs/zh/UserGuide/Server/Docker Image.md | 2 +-
service-rpc/rpc-changelist.md | 4 ++--
tsfile/format-changelist.md | 4 ++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 66e7723..33b44f5 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ For the latest information about IoTDB, please visit [IoTDB official website](ht
# Quick Start
-This short guide will walk you through the basic process of using IoTDB. For a more detailed introduction, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.9.x/chap1/sec1).
+This short guide will walk you through the basic process of using IoTDB. For a more detailed introduction, please visit our website's [User Guide](https://iotdb.apache.org/UserGuide/Master/Get%20Started/QuickStart.html).
## Prerequisites
diff --git a/README_ZH.md b/README_ZH.md
index 523f667..964cb46 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -79,7 +79,7 @@ IoTDB的主要特点如下:
# 快速开始
-这篇简短的指南将带您了解使用IoTDB的基本过程。如需更详细的介绍，请访问我们的网站[用户指南](https://iotdb.apache.org/#/Documents/0.9.x/chap1/sec1)。
+这篇简短的指南将带您了解使用IoTDB的基本过程。如需更详细的介绍，请访问我们的网站[用户指南](http://iotdb.apache.org/zh/UserGuide/Master/Get%20Started/QuickStart.html)。
## 环境准备
diff --git a/docs/UserGuide/Ecosystem Integration/Spark TsFile.md b/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
index 2902323..00d41a3 100644
--- a/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
+++ b/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
@@ -59,7 +59,7 @@ Note:
Start Spark with TsFile-Spark-Connector in distributed mode (That is, the spark cluster is connected by spark-shell):
```
-. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-jar-with-dependencies.jar --master spark://ip:7077
+. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-{version}-jar-with-dependencies.jar --master spark://ip:7077
```
Note:
diff --git a/docs/UserGuide/Server/Docker Image.md b/docs/UserGuide/Server/Docker Image.md
index 9c4f8a6..2cc68fe 100644
--- a/docs/UserGuide/Server/Docker Image.md
+++ b/docs/UserGuide/Server/Docker Image.md
@@ -81,7 +81,7 @@ $ start-client.sh -h localhost -p 6667 -u root -pw root
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0</version>
+ <version>0.10.0</version>
</dependency>
```
Some examples about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
diff --git a/docs/zh/UserGuide/Client/Programming - JDBC.md b/docs/zh/UserGuide/Client/Programming - JDBC.md
index c1cccee..a3b1c8a 100644
--- a/docs/zh/UserGuide/Client/Programming - JDBC.md
+++ b/docs/zh/UserGuide/Client/Programming - JDBC.md
@@ -49,7 +49,7 @@ mvn clean install -pl jdbc -am -Dmaven.test.skip=true
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0</version>
+ <version>0.10.0</version>
</dependency>
</dependencies>
```
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md b/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
index d2966d7..832c073 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
@@ -58,7 +58,7 @@ TsFile-Spark-Connector对Tsfile类型的外部数据源实现Spark的支持。
在分布式模式下使用TsFile-Spark-Connector启动Spark（即，Spark集群通过spark-shell连接）：
```
-. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-0.8.0-jar-with-dependencies.jar --master spark://ip:7077
+. /<spark-shell-path> --jars tsfile-spark-connector.jar,tsfile-{version}-jar-with-dependencies.jar --master spark://ip:7077
```
注意：
diff --git a/docs/zh/UserGuide/Server/Docker Image.md b/docs/zh/UserGuide/Server/Docker Image.md
index 24f074a..190f2db 100644
--- a/docs/zh/UserGuide/Server/Docker Image.md
+++ b/docs/zh/UserGuide/Server/Docker Image.md
@@ -81,7 +81,7 @@ $ start-client.sh -h localhost -p 6667 -u root -pw root
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.8.0</version>
+ <version>0.10.0</version>
</dependency>
```
这里是一些使用 IoTDB-JDBC 连接 IoTDB 的示例: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
diff --git a/service-rpc/rpc-changelist.md b/service-rpc/rpc-changelist.md
index 86ac578..1b60515 100644
--- a/service-rpc/rpc-changelist.md
+++ b/service-rpc/rpc-changelist.md
@@ -20,7 +20,7 @@
-->
-# 0.10.0 (version-1) -> version-2
+# 0.9.x (version-1) -> 0.10.x (version-2)
Last Updated on 2020-5-25 by Kaifeng Xue.
@@ -55,7 +55,7 @@ Last Updated on 2020-5-25 by Kaifeng Xue.
-# 0.8.0 (version-0) -> version-1
+# 0.8.x -> 0.9.x (version-1)
Last Updated on 2019-10-27 by Lei Rui.
diff --git a/tsfile/format-changelist.md b/tsfile/format-changelist.md
index 5aed26b..d9a07d7 100644
--- a/tsfile/format-changelist.md
+++ b/tsfile/format-changelist.md
@@ -20,7 +20,7 @@
-->
-# version-1 -> version-2
+# version-1 (0.9.x) -> version-2 (0.10.x)
Last Updated on 2019-11-28 by Jialin Qiao.
@@ -33,7 +33,7 @@ Last Updated on 2019-11-28 by Jialin Qiao.
| 1047 | [IOTDB-593] Add metaOffset in TsFileMetadata | qiaojialin | Add metaOffset in TsFileMetadata |
| 1100 | [IOTDB-605] Add more levels of index in TsFileMetadata | sunzesong | Update the structure of deviceMetadata to a tree-level indexed TsFileMetadata |
-# 0.8.0 (version-0) -> version-1
+# 0.8.0 -> version-1 (0.9.x)
Last Updated on 2019-10-27 by Lei Rui.