You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/06/28 14:00:34 UTC
[incubator-iotdb] branch master updated: prepare for announcing
releasing v0.10
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 121e2e7 prepare for announcing releasing v0.10
121e2e7 is described below
commit 121e2e79199b3436499c33455315d92ddb10b5a0
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Jun 28 20:27:40 2020 +0800
prepare for announcing releasing v0.10
---
cli/pom.xml | 2 +-
distribution/pom.xml | 2 +-
docker/src/main/Dockerfile | 4 +-
docker/src/main/Dockerfile-0.10.0 | 41 +++++
docs/Download/README.md | 36 ++++
docs/SystemDesign/TsFile/Format.md | 2 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 2 +-
docs/zh/Download/README.md | 30 ++++
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 6 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 2 +-
example/flink/pom.xml | 2 +-
example/hadoop/pom.xml | 6 +-
example/jdbc/pom.xml | 2 +-
example/kafka/pom.xml | 2 +-
example/mqtt/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
example/session/pom.xml | 2 +-
example/tsfile/pom.xml | 2 +-
flink-iotdb-connector/pom.xml | 2 +-
flink-tsfile-connector/pom.xml | 2 +-
grafana/pom.xml | 2 +-
hadoop/pom.xml | 4 +-
hive-connector/pom.xml | 6 +-
jdbc/pom.xml | 2 +-
pom.xml | 2 +-
server/pom.xml | 2 +-
service-rpc/pom.xml | 2 +-
session/pom.xml | 2 +-
site/pom.xml | 40 ++++-
site/src/main/.vuepress/config.js | 192 ++++++++++++++++++++-
spark-iotdb-connector/pom.xml | 2 +-
spark-tsfile/pom.xml | 4 +-
tsfile/pom.xml | 2 +-
35 files changed, 376 insertions(+), 41 deletions(-)
diff --git a/cli/pom.xml b/cli/pom.xml
index b98a497..199ba93 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-cli</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index be62bb0..eb7632e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-distribution</artifactId>
diff --git a/docker/src/main/Dockerfile b/docker/src/main/Dockerfile
index 4ed91c3..611d9cd 100644
--- a/docker/src/main/Dockerfile
+++ b/docker/src/main/Dockerfile
@@ -32,9 +32,9 @@ RUN apt update \
&& cd incubator-iotdb-master \
&& mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
&& cd target/ \
- && unzip apache-iotdb-0.10.0-SNAPSHOT-incubating-bin.zip \
+ && unzip apache-iotdb-0.11.0-SNAPSHOT-incubating-bin.zip \
&& mkdir /iotdb \
- && mv apache-iotdb-0.10.0-SNAPSHOT-incubating/* /iotdb/ \
+ && mv apache-iotdb-0.11.0-SNAPSHOT-incubating/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
diff --git a/docker/src/main/Dockerfile-0.10.0 b/docker/src/main/Dockerfile-0.10.0
new file mode 100644
index 0000000..463e9dc
--- /dev/null
+++ b/docker/src/main/Dockerfile-0.10.0
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+FROM openjdk:11-jre-slim
+RUN apt update \
+ # procps is for `free` command
+ && apt install wget unzip lsof procps -y \
+ && wget https://www-us.apache.org/dist/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip \
+ # if you are in China, use the following URL
+ #&& wget http://mirrors.tuna.tsinghua.edu.cn/apache/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip \
+ && unzip apache-iotdb-0.10.0-incubating-bin.zip \
+ && rm apache-iotdb-0.10.0-incubating-bin.zip \
+ && mv apache-iotdb-0.10.0-incubating /iotdb \
+ && apt remove wget unzip -y \
+ && apt autoremove -y \
+ && apt purge --auto-remove -y \
+ && apt clean -y
+EXPOSE 6667
+EXPOSE 31999
+EXPOSE 5555
+EXPOSE 8181
+VOLUME /iotdb/data
+VOLUME /iotdb/logs
+ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}"
+ENTRYPOINT ["/iotdb/sbin/start-server.sh"]
diff --git a/docs/Download/README.md b/docs/Download/README.md
index e062f4c..2c5df8a 100644
--- a/docs/Download/README.md
+++ b/docs/Download/README.md
@@ -29,6 +29,16 @@
<th>release notes</th>
</tr>
<tr>
+ <td>0.10.0</td>
+ <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip">Release</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.sha512">SHA512</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.asc">ASC</a></td>
+ <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip">Sources</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.sha512">SHA512</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.asc">ASC</a></td>
+ <td><a href="https://raw.githubusercontent.com/apache/incubator-iotdb/release/0.10.0/RELEASE_NOTES.md">release notes</a></td>
+ </tr>
+ <tr>
<td>0.9.3</td>
<td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip">Release</a></td>
<td><a href="https://downloads.apache.org/incubator/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip.sha512">SHA512</a></td>
@@ -51,8 +61,34 @@
</table>
+**<font color=red>Attention</font>**:
+
+- How to upgrade a minor version (e.g., from v0.9.0 to v0.0.3)?
+ * versions which have the same major version are compatible.
+ * Just download and unzip the new version. Then modify the configuration files to keep consistent
+ with what you set in the old version.
+ * stop the old vesion instance, and start the new one.
+
+- How to upgrade from v.9.x to v0.10.x?
+ * Upgrading from v0.9 to v0.10 is more complex than v0.8 to v0.9.
+ * Stop writing new data.
+ * Call `flush` command using sbin/start-client.sh in v0.9 to close all TsFiles.
+ * We recommend to backup the data file (also the wal files and mlog.txt) before upgrading for rolling back.
+ * Just download, unzip v0.10.x.zip, and modify conf/iotdb-engine.proeprties to let all the
+ directories point to the folders set in v0.9.x (or the backup folder).
+ You can also modify other settings if you want.
+ * Stop IoTDB v0.9 instance, and start v0.10.x, then the IoTDB will upgrade data file format automatically.
+
+- How to upgrade from 0.8.x to v0.9.x?
+ * We recommend to backup the data file (also the wal files and mlog.txt) before upgrading for rolling back.
+ * Just download, unzip v0.9.x.zip, and modify conf/iotdb-engine.proeprties to let all the
+ directories point to the folders set in v0.8.x (or the backup folder).
+ You can also modify other settings if you want.
+ * Stop IoTDB v0.8 instance, and start v0.9.x, then the IoTDB will upgrade data file format automatically.
+
+
# All releases
diff --git a/docs/SystemDesign/TsFile/Format.md b/docs/SystemDesign/TsFile/Format.md
index 74a48b7..6fb50c6 100644
--- a/docs/SystemDesign/TsFile/Format.md
+++ b/docs/SystemDesign/TsFile/Format.md
@@ -248,7 +248,7 @@ For Linux or MacOs:
An example on Windows:
```
-D:\incubator-iotdb\server\target\iotdb-server-0.10.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
+D:\incubator-iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
````````````````````````
Starting Printing the IoTDB Data Directory Overview
````````````````````````
diff --git a/docs/UserGuide/Operation Manual/SQL Reference.md b/docs/UserGuide/Operation Manual/SQL Reference.md
index b327d45..cb297a9 100644
--- a/docs/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/UserGuide/Operation Manual/SQL Reference.md
@@ -55,7 +55,7 @@ show version
+---------------+
| version|
+---------------+
-|0.10.0-SNAPSHOT|
+|0.11.0-SNAPSHOT|
+---------------+
Total line number = 1
It costs 0.417s
diff --git a/docs/zh/Download/README.md b/docs/zh/Download/README.md
index 5e6ffdc..811b568 100644
--- a/docs/zh/Download/README.md
+++ b/docs/zh/Download/README.md
@@ -27,6 +27,16 @@
<th colspan="3">IoTDB Sources</th>
<th>release notes</th>
</tr>
+ <tr>
+ <td>0.10.0</td>
+ <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip">Release</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.sha512">SHA512</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-bin.zip.asc">ASC</a></td>
+ <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip">Sources</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.sha512">SHA512</a></td>
+ <td><a href="https://downloads.apache.org/incubator/iotdb/0.10.0-incubating/apache-iotdb-0.10.0-incubating-source-release.zip.asc">ASC</a></td>
+ <td><a href="https://raw.githubusercontent.com/apache/incubator-iotdb/release/0.10.0/RELEASE_NOTES.md">release notes</a></td>
+ </tr>
<tr>
<td>0.9.3</td>
<td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip">Release</a></td>
@@ -50,6 +60,26 @@
</table>
+**<font color=red>升级注意事项</font>**:
+
+- 如何升级小版本 (例如，从 v0.9.0 to v0.0.3)?
+ * 同一个大版本下的多个小版本是互相兼容的。
+ * 只需要下载新的小版本， 然后修改其配置文件，使其与原有版本的设置一致。
+ * 停掉旧版本进程，启动新版本即可。
+
+- 如何从v0.9.x 升级到 v0.10.x?
+ * 停掉0.9的新数据写入。
+ * 用CLI调用`flush`，确保关闭所有的TsFile文件.
+ * 我们推荐提前备份数据文件（以及写前日志和mlog文件），以备回滚。
+ * 下载最新版，解压并修改配置文件。将各数据目录都指向备份的或者v0.9原来使用的数据目录。
+ * 停止v0.9的实例，启动v0.10的实例。IoTDB将自动升级数据文件格式。
+
+- 如何从0.8.x 升级到 v0.9.x?
+ * 我们推荐提前备份数据文件（以及写前日志和mlog文件），以备回滚。
+ * 下载最新版，解压并修改配置文件。将各数据目录都指向备份的或者v0.8原来使用的数据目录。
+ * 停止v0.8的实例，启动v0.9.x的实例。IoTDB将自动升级数据文件格式。
+
+
# 所有版本
diff --git a/docs/zh/SystemDesign/TsFile/Format.md b/docs/zh/SystemDesign/TsFile/Format.md
index 749366b..cb5f065 100644
--- a/docs/zh/SystemDesign/TsFile/Format.md
+++ b/docs/zh/SystemDesign/TsFile/Format.md
@@ -248,7 +248,7 @@ For Linux or MacOs:
在Windows系统中的示例:
```
-D:\incubator-iotdb\server\target\iotdb-server-0.10.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
+D:\incubator-iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
````````````````````````
Starting Printing the IoTDB Data Directory Overview
````````````````````````
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md b/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
index 4b2f617..fa35f1f 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
@@ -74,10 +74,10 @@ TsFile的Hive连接器实现了对Hive读取外部Tsfile类型的文件格式的
然后在hive的命令行中，使用`add jar XXX`命令添加依赖。例如:
```
-hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar;
+hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar;
-Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar] to class path
-Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-SNAPSHOT-jar-with-dependencies.jar]
+Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar] to class path
+Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar]
```
diff --git a/docs/zh/UserGuide/Operation Manual/SQL Reference.md b/docs/zh/UserGuide/Operation Manual/SQL Reference.md
index 154da9e..90afb69 100644
--- a/docs/zh/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/zh/UserGuide/Operation Manual/SQL Reference.md
@@ -46,7 +46,7 @@ show version
+---------------+
| version|
+---------------+
-|0.10.0-SNAPSHOT|
+|0.11.0-SNAPSHOT|
+---------------+
Total line number = 1
It costs 0.417s
diff --git a/example/flink/pom.xml b/example/flink/pom.xml
index 94f9ad5..73a504e 100644
--- a/example/flink/pom.xml
+++ b/example/flink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-example</artifactId>
diff --git a/example/hadoop/pom.xml b/example/hadoop/pom.xml
index 37ef618..4e247d7 100644
--- a/example/hadoop/pom.xml
+++ b/example/hadoop/pom.xml
@@ -24,17 +24,17 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-example</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<name>hadoop-example</name>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/example/jdbc/pom.xml b/example/jdbc/pom.xml
index c578ff9..6967e6e 100644
--- a/example/jdbc/pom.xml
+++ b/example/jdbc/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jdbc-example</artifactId>
diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml
index a86fa4c..1d8c478 100644
--- a/example/kafka/pom.xml
+++ b/example/kafka/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>kafka-example</artifactId>
diff --git a/example/mqtt/pom.xml b/example/mqtt/pom.xml
index 485352b..d1d96ac 100644
--- a/example/mqtt/pom.xml
+++ b/example/mqtt/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mqtt-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index 4b336bd..8cd9c4f 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index fc8248d..c5c8dff 100644
--- a/example/rocketmq/pom.xml
+++ b/example/rocketmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rocketmq-example</artifactId>
diff --git a/example/session/pom.xml b/example/session/pom.xml
index 42f1376..53996a2 100644
--- a/example/session/pom.xml
+++ b/example/session/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-example</artifactId>
diff --git a/example/tsfile/pom.xml b/example/tsfile/pom.xml
index 58e9720..65fc018 100644
--- a/example/tsfile/pom.xml
+++ b/example/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-examples</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile-example</artifactId>
diff --git a/flink-iotdb-connector/pom.xml b/flink-iotdb-connector/pom.xml
index 2538931..5339e08 100644
--- a/flink-iotdb-connector/pom.xml
+++ b/flink-iotdb-connector/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-iotdb-connector</artifactId>
diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml
index c18aa91..fbe26b1 100644
--- a/flink-tsfile-connector/pom.xml
+++ b/flink-tsfile-connector/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-tsfile-connector</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 9def167..7c533ee 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 3e01236..d1cb54b 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-tsfile</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index f289aa5..3481476 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index c4f0526..7695d73 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index 32ddffe..2b39876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB (incubating) Project Parent POM</name>
<description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description>
diff --git a/server/pom.xml b/server/pom.xml
index f6dbab4..e617d3b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index fb0bf36..6a2c57a 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/session/pom.xml b/session/pom.xml
index 91cfce6..67fea02 100644
--- a/session/pom.xml
+++ b/session/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/site/pom.xml b/site/pom.xml
index a874880..f85a744 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -195,6 +195,18 @@
<version>1.3.0</version>
<executions>
<execution>
+ <id>get-0.10-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.10.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.10.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ <execution>
<id>get-0.9-docs</id>
<phase>generate-sources</phase>
<goals>
@@ -228,6 +240,32 @@
<inherited>false</inherited>
<executions>
<execution>
+ <id>copy-0.10-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.10.x.zip/incubator-iotdb-rel-0.10/docs/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.10.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.10-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+ <directory>${project.build.directory}/download/0.10.x.zip/incubator-iotdb-rel-0.10/docs/zh/UserGuide</directory>
+ <outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.10.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-0.9-documentation</id>
<goals>
<goal>copy</goal>
diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js
index 6c613aa..c0d9bb9 100644
--- a/site/src/main/.vuepress/config.js
+++ b/site/src/main/.vuepress/config.js
@@ -73,8 +73,9 @@ var config = {
text: 'Document',
items: [
{ text: 'In progress', link: '/UserGuide/Master/Get Started/QuickStart' },
+ { text: 'V0.10.x', link: '/UserGuide/V0.10.x/Get Started/QuickStart' },
{ text: 'V0.9.x', link: '/UserGuide/V0.9.x/0-Get Started/1-QuickStart' },
- { text: 'V0.8.x', link: '/UserGuide/V0.8.x/0-Get Started/1-QuickStart'},
+ { text: 'V0.8.x', link: '/UserGuide/V0.8.x/0-Get Started/1-QuickStart'},
]
},
{
@@ -301,6 +302,100 @@ var config = {
]
},
],
+ '/UserGuide/V0.10.x/': [
+ {
+ title:'IoTDB User Guide (V0.10.x)',
+ collapsable: false,
+ },
+ {
+ title: 'Get Started',
+ children: [
+ ['Get Started/QuickStart','QuickStart'],
+ ['Get Started/Frequently asked questions','Frequently asked questions'],
+ ['Get Started/Publication','Research Papers']
+ ]
+ },
+ {
+ title: 'Overview',
+ children: [
+ ['Overview/What is IoTDB','What is IoTDB'],
+ ['Overview/Architecture','Architecture'],
+ ['Overview/Scenario','Scenario'],
+ ['Overview/Features','Features']
+ ]
+ },
+ {
+ title: 'Concept',
+ children: [
+ ['Concept/Data Model and Terminology','Data Model and Terminology'],
+ ['Concept/Data Type','Data Type'],
+ ['Concept/Encoding','Encoding'],
+ ['Concept/Compression','Compression']
+ ]
+ },
+ {
+ title: 'Server',
+ children: [
+ ['Server/Download','Download'],
+ ['Server/Single Node Setup','Single Node Setup'],
+ ['Server/Cluster Setup','Cluster Setup'],
+ ['Server/Config Manual','Config Manual'],
+ ['Server/Docker Image','Docker Image']
+ ]
+ },
+ {
+ title: 'Client',
+ children: [
+ ['Client/Command Line Interface','Command Line Interface'],
+ ['Client/Programming - Native API','Native API'],
+ ['Client/Programming - JDBC','JDBC'],
+ ['Client/Programming - Other Languages','Other Languages'],
+ ['Client/Programming - TsFile API','TsFile API'],
+ ['Client/Programming - MQTT','MQTT'],
+ ['Client/Status Codes','Status Codes']
+ ]
+ },
+ {
+ title: 'Operation Manual',
+ children: [
+ ['Operation Manual/DDL Data Definition Language','DDL (Data Definition Language)'],
+ ['Operation Manual/DML Data Manipulation Language','DML (Data Manipulation Language)'],
+ ['Operation Manual/Administration','Administration'],
+ ['Operation Manual/SQL Reference','SQL Reference']
+ ]
+ },
+ {
+ title: 'System Tools',
+ children: [
+ ['System Tools/Sync Tool','Sync Tool'],
+ ['System Tools/Memory Estimation Tool','Memory Estimation Tool'],
+ ['System Tools/JMX Tool','JMX Tool'],
+ ['System Tools/Watermark Tool','Watermark Tool'],
+ ['System Tools/Log Visualizer','Log Visualizer'],
+ ['System Tools/Query History Visualization Tool','Query History Visualization Tool'],
+ ['System Tools/Monitor and Log Tools','Monitor and Log Tools'],
+ ['System Tools/Load External Tsfile','Load External Tsfile']
+ ]
+ },
+ {
+ title: 'Ecosystem Integration',
+ children: [
+ ['Ecosystem Integration/Grafana','Grafana'],
+ ['Ecosystem Integration/MapReduce TsFile','MapReduce TsFile'],
+ ['Ecosystem Integration/Spark TsFile','Spark TsFile'],
+ ['Ecosystem Integration/Spark IoTDB','Spark IoTDB'],
+ ['Ecosystem Integration/Hive TsFile','Hive TsFile']
+ ]
+ },
+ {
+ title: 'Architecture',
+ children: [
+ ['Architecture/Files','Files'],
+ ['Architecture/Writing Data on HDFS','Writing Data on HDFS'],
+ ['Architecture/Shared Nothing Cluster','Shared Nothing Cluster']
+ ]
+ },
+ ],
'/UserGuide/Master/': [
{
title:'IoTDB User Guide (In progress)',
@@ -501,6 +596,7 @@ var config = {
text: '文档',
items: [
{ text: 'In progress', link: '/zh/UserGuide/Master/Get Started/QuickStart' },
+ { text: 'V0.10.x', link: '/zh/UserGuide/V0.10.x/Get Started/QuickStart' },
{ text: 'V0.9.x', link: '/zh/UserGuide/V0.9.x/0-Get Started/1-QuickStart' },
{ text: 'V0.8.x', link: '/zh/UserGuide/V0.8.x/0-Get Started/1-QuickStart'},
]
@@ -722,6 +818,100 @@ var config = {
]
},
],
+ '/zh/UserGuide/V0.10.x/': [
+ {
+ title: 'IoTDB用户手册 (v0.10.x)',
+ collapsable: false,
+ },
+ {
+ title: '开始',
+ children: [
+ ['Get Started/QuickStart','快速入门'],
+ ['Get Started/Frequently asked questions','经常问的问题'],
+ ['Get Started/Publication','调查报告']
+ ]
+ },
+ {
+ title: '概述',
+ children: [
+ ['Overview/What is IoTDB','什么是IoTDB'],
+ ['Overview/Architecture','架构'],
+ ['Overview/Scenario','场景'],
+ ['Overview/Features','特征']
+ ]
+ },
+ {
+ title: '概念',
+ children: [
+ ['Concept/Data Model and Terminology','数据模型与技术'],
+ ['Concept/Data Type','数据类型'],
+ ['Concept/Encoding','编码方式'],
+ ['Concept/Compression','压缩方式']
+ ]
+ },
+ {
+ title: '服务器端',
+ children: [
+ ['Server/Download','下载'],
+ ['Server/Single Node Setup','单节点安装'],
+ ['Server/Cluster Setup','集群设置'],
+ ['Server/Config Manual','配置手册'],
+ ['Server/Docker Image','Docker镜像']
+ ]
+ },
+ {
+ title: '客户端',
+ children: [
+ ['Client/Command Line Interface','命令行接口(CLI)'],
+ ['Client/Programming - Native API','原生接口'],
+ ['Client/Programming - JDBC','JDBC'],
+ ['Client/Programming - Other Languages','其他语言'],
+ ['Client/Programming - TsFile API','TsFile API'],
+ ['Client/Programming - MQTT','MQTT'],
+ ['Client/Status Codes','状态码']
+ ]
+ },
+ {
+ title: '操作指南',
+ children: [
+ ['Operation Manual/DDL Data Definition Language','DDL (数据定义语言)'],
+ ['Operation Manual/DML Data Manipulation Language','DML (数据操作语言)'],
+ ['Operation Manual/Administration','权限管理语句'],
+ ['Operation Manual/SQL Reference','SQL 参考文档']
+ ]
+ },
+ {
+ title: '系统工具',
+ children: [
+ ['System Tools/Sync Tool','同步工具'],
+ ['System Tools/Memory Estimation Tool','内存预估'],
+ ['System Tools/JMX Tool','JMX工具'],
+ ['System Tools/Watermark Tool','水印工具'],
+ ['System Tools/Log Visualizer','日志可视化工具'],
+ ['System Tools/Query History Visualization Tool','查询历史可视化工具'],
+ ['System Tools/Monitor and Log Tools','监控与日志工具'],
+ ['System Tools/Load External Tsfile','加载外部tsfile文件']
+ ]
+ },
+ {
+ title: '生态集成',
+ children: [
+ ['Ecosystem Integration/Grafana','Grafana'],
+ ['Ecosystem Integration/MapReduce TsFile','MapReduce TsFile'],
+ ['Ecosystem Integration/Spark TsFile','Spark TsFile'],
+ ['Ecosystem Integration/Spark IoTDB','Spark IoTDB'],
+ ['Ecosystem Integration/Hive TsFile','Hive TsFile']
+ ]
+ },
+ {
+ title: '系统设计',
+ children: [
+ ['Architecture/Files','文件'],
+ ['Architecture/Writing Data on HDFS','使用HDFS存储数据'],
+ ['Architecture/Shared Nothing Cluster','Shared-nothing 架构']
+ ]
+ }
+ ],
'/zh/UserGuide/Master/': [
{
title: 'IoTDB用户手册 (In progress)',
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index 3ddd505..da2ea17 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-iotdb-connector</artifactId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index d644d79..5d846c0 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>spark-tsfile</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 26ed68f..f97265f 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>