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/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new ccd6fab [IOTDB-1032]Refactor site/pom.xml and move v0.11 to 0.12 in
all pom files (#2139)
ccd6fab is described below
commit ccd6fab13c8ef2b95d1608d5b3e42e587271b8c6
Author: Xiangdong Huang <[email protected]>
AuthorDate: Wed Dec 2 20:50:59 2020 +0800
[IOTDB-1032]Refactor site/pom.xml and move v0.11 to 0.12 in all pom files
(#2139)
* update how to compile the site
* upgrade version to v0.12
* remove download links of legacy versions, add -c parameter for cli in doc
---
antlr/pom.xml | 2 +-
cli/pom.xml | 4 +-
client-cpp/client-cpp-example/pom.xml | 4 +-
client-cpp/pom.xml | 4 +-
client-py/pom.xml | 2 +-
client-py/pypi/setup.py | 2 +-
compile-tools/boost/pom.xml | 2 +-
compile-tools/pom.xml | 4 +-
compile-tools/thrift/pom.xml | 2 +-
cross-tests/pom.xml | 2 +-
distribution/pom.xml | 2 +-
docker/src/main/Dockerfile | 4 +-
docs/Download/README.md | 47 +-
docs/SystemDesign/TsFile/Format.md | 2 +-
docs/UserGuide/Client/Command Line Interface.md | 1 +
docs/UserGuide/Operation Manual/SQL Reference.md | 2 +-
docs/zh/Download/README.md | 47 +-
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
docs/zh/UserGuide/Client/Command Line Interface.md | 2 +-
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 6 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 2 +-
docs/zh/UserGuide/Server/Download.md | 14 +-
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/pulsar/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 +-
.../resources/conf/iotdb-engine.properties | 2 +-
service-rpc/pom.xml | 2 +-
session/pom.xml | 2 +-
site/README-zh.md | 8 +-
site/README.md | 15 +-
site/pom.xml | 568 +++++++++++++++++----
site/src/main/.vuepress/config.js | 196 ++++++-
site/src/main/package.json | 6 +-
spark-iotdb-connector/pom.xml | 2 +-
spark-tsfile/pom.xml | 4 +-
thrift/pom.xml | 2 +-
tsfile/pom.xml | 2 +-
52 files changed, 786 insertions(+), 228 deletions(-)
diff --git a/antlr/pom.xml b/antlr/pom.xml
index 955bd75..8ecdb6e 100644
--- a/antlr/pom.xml
+++ b/antlr/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-antlr</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 78eef51..1fb8f29 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-cli</artifactId>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/client-cpp/client-cpp-example/pom.xml
b/client-cpp/client-cpp-example/pom.xml
index 5c93171..2cf6bb7 100644
--- a/client-cpp/client-cpp-example/pom.xml
+++ b/client-cpp/client-cpp-example/pom.xml
@@ -24,12 +24,12 @@
<parent>
<artifactId>client-cpp</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp-example</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<profiles>
<profile>
<id>os-unix</id>
diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml
index dc64efb..df48627 100644
--- a/client-cpp/pom.xml
+++ b/client-cpp/pom.xml
@@ -24,12 +24,12 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<name>Client for cpp</name>
<description>C++ client</description>
<packaging>pom</packaging>
diff --git a/client-py/pom.xml b/client-py/pom.xml
index 9181d87..564d765 100644
--- a/client-py/pom.xml
+++ b/client-py/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-python-api</artifactId>
diff --git a/client-py/pypi/setup.py b/client-py/pypi/setup.py
index 23b9a8b..c3ec019 100644
--- a/client-py/pypi/setup.py
+++ b/client-py/pypi/setup.py
@@ -31,7 +31,7 @@ print(long_description)
setuptools.setup(
name="apache-iotdb", # Replace with your own username
- version="0.11.0",
+ version="0.12.0",
author=" Apache Software Foundation",
author_email="[email protected]",
description="Apache IoTDB client API",
diff --git a/compile-tools/boost/pom.xml b/compile-tools/boost/pom.xml
index e27e4af..29f8f09 100644
--- a/compile-tools/boost/pom.xml
+++ b/compile-tools/boost/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp-tools</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>client-cpp-tools-boost</artifactId>
diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml
index cffd1a2..a7f30d0 100644
--- a/compile-tools/pom.xml
+++ b/compile-tools/pom.xml
@@ -22,12 +22,12 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>client-cpp-tools</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Compile Tools</name>
<properties>
diff --git a/compile-tools/thrift/pom.xml b/compile-tools/thrift/pom.xml
index 3dc948c..28fb46b 100644
--- a/compile-tools/thrift/pom.xml
+++ b/compile-tools/thrift/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>client-cpp-tools</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>client-cpp-tools-thrift</artifactId>
diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml
index 3cc3da6..cd3e956 100644
--- a/cross-tests/pom.xml
+++ b/cross-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cross-tests</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bab0851..f97179a 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 2698f93..44d5361 100644
--- a/docker/src/main/Dockerfile
+++ b/docker/src/main/Dockerfile
@@ -32,9 +32,9 @@ RUN apt update \
&& cd 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.11.0-SNAPSHOT-bin.zip \
+ && unzip apache-iotdb-0.12.0-SNAPSHOT-bin.zip \
&& mkdir /iotdb \
- && mv apache-iotdb-0.11.0-SNAPSHOT/* /iotdb/ \
+ && mv apache-iotdb-0.12.0-SNAPSHOT/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
diff --git a/docs/Download/README.md b/docs/Download/README.md
index f3d0f40..5886173 100644
--- a/docs/Download/README.md
+++ b/docs/Download/README.md
@@ -29,6 +29,16 @@
<th>release notes</th>
</tr>
<tr>
+ <td>0.11.0</td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip";>Release</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip.sha512";>SHA512</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip.asc";>ASC</a></td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip";>Sources</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip.sha512";>SHA512</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip.asc";>ASC</a></td>
+ <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.11.0/RELEASE_NOTES.md";>release
notes</a></td>
+ </tr>
+ <tr>
<td>0.10.1</td>
<td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip";>Release</a></td>
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip.sha512";>SHA512</a></td>
@@ -38,29 +48,12 @@
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-source-release.zip.asc";>ASC</a></td>
<td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.10.1/RELEASE_NOTES.md";>release
notes</a></td>
</tr>
- <tr>
- <td>0.9.3</td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip";>Release</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip.asc";>ASC</a></td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip";>Sources</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip.asc";>ASC</a></td>
- <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.9.3/RELEASE_NOTES.md";>release
notes</a></td>
- </tr>
- <tr>
- <td>0.8.2</td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip";>Release</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.asc";>ASC</a></td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip";>Sources</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip.asc";>ASC</a></td>
- <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.8.2/RELEASE_NOTES.md";>release
notes</a></td>
- </tr>
</table>
+Legacy version are available here:
[https://archive.apache.org/dist/iotdb/](https://archive.apache.org/dist/iotdb/)
+
+
**<font color=red>Attention</font>**:
- How to upgrade a minor version (e.g., from v0.9.0 to v0.9.3)?
@@ -69,6 +62,20 @@
with what you set in the old version.
* stop the old vesion instance, and start the new one.
+- How to upgrade from v.10.x to v0.11.x?
+ * The data format (i.e., TsFile data) of v0.10.x and v0.11 are compatible,
but the WAL file is
+ incompatible. So, you can follow the steps:
+ * Stop writing new data.
+ * Call `flush` command using `sbin/start-cli.sh` in v0.10.x to close all
TsFiles.
+ * We recommend to backup the the wal files and mlog.txt before upgrading for
rolling back.
+ * Just download, unzip v0.11.x.zip, and modify conf/iotdb-engine.proeprties
to let all the
+ directories point to the data folder set in v0.10.x (or the backup
folder). You can also modify
+ other settings if you want.
+ * Stop IoTDB v0.10.x instance, and start v0.11.x, then the IoTDB will
upgrade data file format
+ automatically.
+ * __NOTICE: V0.11 changes many settings in conf/iotdb-engine.properties, so
do not use v0.10's
+ configuration file directly.__
+
- 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.
diff --git a/docs/SystemDesign/TsFile/Format.md
b/docs/SystemDesign/TsFile/Format.md
index 534d577..f9a93d6 100644
--- a/docs/SystemDesign/TsFile/Format.md
+++ b/docs/SystemDesign/TsFile/Format.md
@@ -265,7 +265,7 @@ For Linux or MacOs:
An example on Windows:
```
-D:\iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat
D:\\data\data
+D:\iotdb\server\target\iotdb-server-0.12.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat
D:\\data\data
|````````````````````````
Starting Printing the IoTDB Data Directory Overview
|````````````````````````
diff --git a/docs/UserGuide/Client/Command Line Interface.md
b/docs/UserGuide/Client/Command Line Interface.md
index 855c566..b86feb0 100644
--- a/docs/UserGuide/Client/Command Line Interface.md
+++ b/docs/UserGuide/Client/Command Line Interface.md
@@ -91,6 +91,7 @@ Enter ```quit``` or `exit` can exit Cli. The cli will shows
`quit normally`
|-u <`username`>|string, no quotation marks|Yes|User name used for IoTDB to
connect the server|-u root|
|-maxPRC <`maxPrintRowCount`>|int|No|Set the maximum number of rows that IoTDB
returns|-maxPRC 10|
|-e <`execute`> |string|No|manipulate IoTDB in batches without entering cli
input mode|-e "show storage group"|
+|-c | empty | No | If the server enables `rpc_thrift_compression_enable=true`,
then cli must use `-c` | -c |
Following is a cli command which connects the host with IP
10.129.187.21, rpc port 6667, username "root", password "root", and prints the
timestamp in digital form. The maximum number of lines displayed on the IoTDB
command line is 10.
diff --git a/docs/UserGuide/Operation Manual/SQL Reference.md
b/docs/UserGuide/Operation Manual/SQL Reference.md
index 0c74ff2..e8efc11 100644
--- a/docs/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/UserGuide/Operation Manual/SQL Reference.md
@@ -40,7 +40,7 @@ show version
+---------------+
| version|
+---------------+
-|0.11.0-SNAPSHOT|
+|0.12.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 beaa88c..c49f69b 100644
--- a/docs/zh/Download/README.md
+++ b/docs/zh/Download/README.md
@@ -28,38 +28,31 @@
<th>release notes</th>
</tr>
<tr>
+ <td>0.11.0</td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip";>可执行程序</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip.sha512";>SHA512</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-bin.zip.asc";>ASC</a></td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip";>源代码</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip.sha512";>SHA512</a></td>
+ <td><a
href="https://downloads.apache.org/iotdb/0.11.0/apache-iotdb-0.11.0-source-release.zip.asc";>ASC</a></td>
+ <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.11.0/RELEASE_NOTES.md";>release
notes</a></td>
+ </tr>
+ <tr>
<td>0.10.1</td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip";>Release</a></td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip";>可执行程序</a></td>
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip.sha512";>SHA512</a></td>
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-bin.zip.asc";>ASC</a></td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-source-release.zip";>Sources</a></td>
+ <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-source-release.zip";>源代码</a></td>
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-source-release.zip.sha512";>SHA512</a></td>
<td><a
href="https://downloads.apache.org/iotdb/0.10.1-incubating/apache-iotdb-0.10.1-incubating-source-release.zip.asc";>ASC</a></td>
<td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.10.1/RELEASE_NOTES.md";>release
notes</a></td>
</tr>
- <tr>
- <td>0.9.3</td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip";>Release</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-bin.zip.asc";>ASC</a></td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip";>Sources</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.9.3-incubating/apache-iotdb-0.9.3-incubating-source-release.zip.asc";>ASC</a></td>
- <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.9.3/RELEASE_NOTES.md";>release
notes</a></td>
- </tr>
- <tr>
- <td>0.8.2</td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip";>Release</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.asc";>ASC</a></td>
- <td><a
href="https://www.apache.org/dyn/closer.cgi/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip";>Sources</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip.sha512";>SHA512</a></td>
- <td><a
href="https://downloads.apache.org/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip.asc";>ASC</a></td>
- <td><a
href="https://raw.githubusercontent.com/apache/iotdb/release/0.8.2/RELEASE_NOTES.md";>release
notes</a></td>
- </tr>
</table>
+历史版本下载:
[https://archive.apache.org/dist/iotdb/](https://archive.apache.org/dist/iotdb/)
+
+
**<font color=red>升级注意事项</font>**:
- 如何升级小版本 (例如，从 v0.9.0 to v0.9.3)?
@@ -67,6 +60,16 @@
* 只需要下载新的小版本， 然后修改其配置文件，使其与原有版本的设置一致。
* 停掉旧版本进程，启动新版本即可。
+- 如何从v0.10.x 升级到 v0.11.x?
+ * 0.10 与0.11的数据文件格式兼容，但写前日志等格式不兼容，因此需要进行升级（但速度很快）：
+ * 停掉0.10的新数据写入。
+ * 用CLI调用`flush`，确保关闭所有的TsFile文件.
+ * 我们推荐提前备份写前日志和mlog文件，以备回滚。
+ * 下载最新版，解压并修改配置文件。将各数据目录都指向备份的或者v0.10原来使用的数据目录。
+ * 停止v0.10的实例，启动v0.11的实例。IoTDB将自动升级不兼容的文件格式。
+ * __注意：0.11的配置文件进行了较大改动，因此不要直接将0.10的配置文件用于0.11__
+
+
- 如何从v0.9.x 升级到 v0.10.x?
* 停掉0.9的新数据写入。
* 用CLI调用`flush`，确保关闭所有的TsFile文件.
diff --git a/docs/zh/SystemDesign/TsFile/Format.md
b/docs/zh/SystemDesign/TsFile/Format.md
index d8eb674..3b8fbb7 100644
--- a/docs/zh/SystemDesign/TsFile/Format.md
+++ b/docs/zh/SystemDesign/TsFile/Format.md
@@ -265,7 +265,7 @@ For Linux or MacOs:
在Windows系统中的示例:
```
-D:\iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat
D:\\data\data
+D:\iotdb\server\target\iotdb-server-0.12.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/Client/Command Line Interface.md
b/docs/zh/UserGuide/Client/Command Line Interface.md
index 67c6792..9620db5 100644
--- a/docs/zh/UserGuide/Client/Command Line Interface.md
+++ b/docs/zh/UserGuide/Client/Command Line Interface.md
@@ -88,7 +88,7 @@ IoTDB>
|-u <`username`>|string类型，不需要引号|是|IoTDB连接服务器锁使用的用户名。|-u root|
|-maxPRC <`maxPrintRowCount`>|int类型|否|设置IoTDB返回客户端命令行中所显示的最大行数。|-maxPRC 10|
|-e <`execute`> |string类型|否|在不进入客户端输入模式的情况下，批量操作IoTDB|-e "show storage group"|
-
+|-c | 控 | 否 | 如果服务器设置了 `rpc_thrift_compression_enable=true`, 则CLI必须使用 `-c` |
-c |
下面展示一条客户端命令，功能是连接IP为10.129.187.21的主机，端口为6667
，用户名为root，密码为root，以数字的形式打印时间戳，IoTDB命令行显示的最大行数为10。
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
b/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
index bb0f7da..85f1df5 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`命令添加依赖。例如:
```shell
-hive> add jar
/Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar;
+hive> add jar
/Users/hive/iotdb/hive-connector/target/hive-connector-0.12.0-SNAPSHOT-jar-with-dependencies.jar;
-Added
[/Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar]
to class path
-Added resources:
[/Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar]
+Added
[/Users/hive/iotdb/hive-connector/target/hive-connector-0.12.0-SNAPSHOT-jar-with-dependencies.jar]
to class path
+Added resources:
[/Users/hive/iotdb/hive-connector/target/hive-connector-0.12.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 473dfae..7a0003b 100644
--- a/docs/zh/UserGuide/Operation Manual/SQL Reference.md
+++ b/docs/zh/UserGuide/Operation Manual/SQL Reference.md
@@ -31,7 +31,7 @@ show version
+---------------+
| version|
+---------------+
-|0.11.0-SNAPSHOT|
+|0.12.0-SNAPSHOT|
+---------------+
Total line number = 1
It costs 0.417s
diff --git a/docs/zh/UserGuide/Server/Download.md
b/docs/zh/UserGuide/Server/Download.md
index eb72aa3..030398c 100644
--- a/docs/zh/UserGuide/Server/Download.md
+++ b/docs/zh/UserGuide/Server/Download.md
@@ -39,27 +39,15 @@ IoTDB为您提供了两种安装方式，您可以参考下面的建议，任选
## 从官网下载二进制可执行文件
-您可以从[http://iotdb.apache.org/Download/](http://iotdb.apache.org/Download/)上下载已经编译好的可执行程序iotdb-xxx.tar.gz或者iotdb-xxx.zip，该压缩包包含了IoTDB系统运行所需的所有必要组件。
+您可以从[http://iotdb.apache.org/Download/](http://iotdb.apache.org/Download/)上下载已经编译好的可执行程序iotdb-xxx.zip，该压缩包包含了IoTDB系统运行所需的所有必要组件。
-```
-NOTE:
-iotdb-<version>.tar.gz # For Linux or MacOS
-iotdb-<version>.zip # For Windows
-```
下载后，您可使用以下操作对IoTDB的压缩包进行解压:
-如果您使用的操作系统是Windows，则使用解压缩工具解压或使用如下解压命令：
-
```
Shell > uzip iotdb-<version>.zip
```
-如果您使用的操作系统是Linux或MacOS，则使用如下解压命令：
-
-```
-Shell > tar -zxf iotdb-<version>.tar.gz # For Linux or MacOS
-```
## 使用源码编译
diff --git a/example/flink/pom.xml b/example/flink/pom.xml
index 73a504e..398c789 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 4e247d7..51f2ab3 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-example</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<name>hadoop-example</name>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/example/jdbc/pom.xml b/example/jdbc/pom.xml
index 6967e6e..019d998 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 1d8c478..886c5ac 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 d1d96ac..04a97f1 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mqtt-example</artifactId>
diff --git a/example/pom.xml b/example/pom.xml
index e108400..4edad4e 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
diff --git a/example/pulsar/pom.xml b/example/pulsar/pom.xml
index cb329a2..f20ce92 100644
--- a/example/pulsar/pom.xml
+++ b/example/pulsar/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>iotdb-examples</artifactId>
<groupId>org.apache.iotdb</groupId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml
index 1384b0d..d4bb60d 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 53996a2..6fd056b 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 65fc018..3dfaf1e 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 8d4c0b4..8c1e280 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 6b04fe9..f4437e6 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-tsfile-connector</artifactId>
diff --git a/grafana/pom.xml b/grafana/pom.xml
index d9f5222..975c9d4 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!--parent>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index 6b33daa..5b6456c 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.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index ae1bd5a..4e8b81a 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 87dc567..aeec890 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index f671eb1..1cf788d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache IoTDB 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 157e677..050f8ab 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-server</artifactId>
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index aae3444..b9b698a 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -203,7 +203,7 @@ tag_attribute_total_size=700
# if enable partial insert, one measurement failure will not impact other
measurements
enable_partial_insert=true
-# Whether to enable MTree snapshot. Default false in 0.11.0
+# Whether to enable MTree snapshot. Default false from 0.11.0 on.
enable_mtree_snapshot=false
# The least interval line numbers of mlog.txt when creating a checkpoint and
saving snapshot of MTree.
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index a82e815..f692814 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>service-rpc</artifactId>
diff --git a/session/pom.xml b/session/pom.xml
index a5f75a3..4276223 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/site/README-zh.md b/site/README-zh.md
index 1ebf68e..123f17c 100644
--- a/site/README-zh.md
+++ b/site/README-zh.md
@@ -29,11 +29,11 @@
## 如何建立
-跑`mvn package -DskipTests -P compile-site`
+跑`mvn compile -DskipTests -P compile-site -P download-website`
## 如何调试
-当跑完 `mvn package -DskipTests -P compile-site`, 所有的源文档都会复制到target/vue-source目录下
+当跑完 `mvn generate-sources -DskipTests -P compile-site`,
所有的源文档都会复制到target/vue-source目录下
如果你想要调试：
@@ -50,11 +50,11 @@ npm run build
## 手动部署
-跑`mvn package scm-publish:publish-scm -P compile-site`.
+跑`mvn compile scm-publish:publish-scm -P compile-site`.
Apache ID和密码是必须的
-或直接运行`mvn package scm-publish:publish-scm -Dusername={你的Apache ID}
-Dpassword={你的Apache账号密码} -P compile-site`
+或直接运行`mvn compile scm-publish:publish-scm -Dusername={你的Apache ID}
-Dpassword={你的Apache账号密码} -P compile-site`
## 常见问题
diff --git a/site/README.md b/site/README.md
index cd893f8..5c2d1b4 100644
--- a/site/README.md
+++ b/site/README.md
@@ -32,16 +32,21 @@ See https://iotdb.apache.org/
## Build Setup
-run `mvn package -DskipTests -P compile-site` for doing the following steps
automatically:
+run `mvn compile -DskipTests -P compile-site -P download-website` for doing
the following steps automatically:
- get docs from the master branch and all lagecy docs remotely.
- download node.js and npm;
-- run `npm install` and `npm run build -P compile-site`
+- run `npm install` and `npm run build`
+- the final website will be generated in `target/vue-source/src/.vuepress/dist`
+
+Notice that we will only compile the docs from the master branch, and just
copy static htmls from
+iotdb-website. If you want to compile lagecy docs, using `-P
compile-site-<version>`,
+e.g., `mvn compile -P compile-site -P compile-site-0.11 -P compile-site-0.10`
## How to Debug
-after running `mvn package -DskipTests`, all source codes are copied into
target/vue-source
+after running `mvn compile -DskipTests`, all source codes are copied into
target/vue-source
then if you want to debug, just run
@@ -58,11 +63,11 @@ All changes in the target folder will be ignored by Git.
## Deploy Manually
-run `mvn package scm-publish:publish-scm -P compile-site`.
+run `mvn compile scm-publish:publish-scm -P compile-site`.
Apache ID and passwored is needed.
-Or run `mvn package scm-publish:publish-scm -Dusername={YOUR_APACHE_ID}
-Dpassword={YOUR_APACHE_PASSWORD} -P compile-site`
+Or run `mvn compile scm-publish:publish-scm -Dusername={YOUR_APACHE_ID}
-Dpassword={YOUR_APACHE_PASSWORD} -P compile-site`
## FAQ
diff --git a/site/pom.xml b/site/pom.xml
index 6c58749..fd02a34 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,27 +38,112 @@
</site>
</distributionManagement>
<profiles>
+ <!--
+ Process:
+ 1. download existing static website from github
+ 2. copy and unpack it to a tmp folder
+ 3. if site-compile-0.x is enabled, download files of 0.x from github,
+ (except the master branch). copy it to the source tmp folder
+ 4. compiling...
+ 5. if site-compile-0.x is disabled, copy existing static files from
the tmp folder to the
+ target folder.
+ 6. upload to github website
+ -->
<profile>
- <id>compile-site</id>
+ <id>download-site</id>
<build>
<plugins>
- <!-- copy source codes into vue required folders-->
+ <!-- download existing website from iotdb repo -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <id>get-existing-site</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/apache/iotdb-website/archive/asf-site.zip</url>
+
<outputDirectory>${project.build.directory}/download</outputDirectory>
+
<outputFileName>website.zip</outputFileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- unpack existing website from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>unpack-existing-docs</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <fileset>
+
<directory>${project.build.directory}/download/website.zip/iotdb-website-asf-site/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/existing/UserGuide</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-existing-zh-docs</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <fileset>
+
<directory>${project.build.directory}/download/website.zip/iotdb-website-asf-site/zh/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/existing/zh/UserGuide</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Copy existing documents-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
+ <!-- copy source codes into vue required folders-->
<execution>
- <id>copy-source-code-to-docs-folder</id>
+ <id>copy-existing-docs-to-dist</id>
<!-- here the phase you need -->
- <phase>generate-sources</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+
<outputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist/UserGuide</outputDirectory>
<!-- output directory -->
<resources>
<resource>
-
<directory>${basedir}/src/main/</directory>
+
<directory>${project.build.directory}/existing/UserGuide/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-existing-zh-docs-to-dist</id>
+ <!-- here the phase you need -->
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist/zh/UserGuide</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/existing/zh/UserGuide/</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -66,12 +151,41 @@
</execution>
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- by default, only the master branch is compiled and uploaded.
+ Use -Dsite.download.existing.htmls=true to contain all other htmls
(v0.8,v0.9 etc..)
+ -->
+ <id>compile-site</id>
+ <build>
+ <plugins>
<!-- Copy master documents-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
+ <!-- copy source codes into vue required folders-->
<execution>
- <id>copy-master-docs-to-docs</id>
+ <id>copy-source-code-to-vue-source-folder</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+
<directory>${basedir}/src/main/</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-master-docs-to-vue-source-folder</id>
<!-- here the phase you need -->
<phase>generate-sources</phase>
<goals>
@@ -83,6 +197,45 @@
<resources>
<resource>
<directory>${basedir}/../docs</directory>
+ <excludes>
+
<exclude>UserGuide/**/*</exclude>
+
<exclude>zh/UserGuide/**/*</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+
<id>copy-master-userguide-docs-to-vue-source-folder</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/Master</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+
<directory>${basedir}/../docs/UserGuide</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+
<id>copy-master-zh-userguide-docs-to-vue-source-folder</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/Master</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+
<directory>${basedir}/../docs/zh/UserGuide</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -142,7 +295,7 @@
</execution>
</executions>
</plugin>
- <!-- mv UserGuide of master into master folder -->
+ <!-- copy single files, and move UserGuide of master into
tmp folder -->
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
@@ -167,75 +320,224 @@
</fileSets>
</configuration>
</execution>
+ <!-- remove files if `existing` folder exist-->
<execution>
- <id>mv-master-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
+ <id>clean-stale-master-doc</id>
+ <phase>compile</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
-
<sourceFile>${project.build.directory}/vue-source/src/UserGuide</sourceFile>
-
<destinationFile>${project.build.directory}/vue-source/src/tmpUserGuide/Master</destinationFile>
+
<sourceFile>${project.build.directory}/existing/UserGuide/Master</sourceFile>
+
<destinationFile>${project.build.directory}/existing/Master</destinationFile>
</configuration>
</execution>
<execution>
- <id>mv-master-zh-userguide-to-tmp-folder</id>
- <phase>generate-sources</phase>
+ <id>clean-stale-master-zh-doc</id>
+ <phase>compile</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
-
<sourceFile>${project.build.directory}/vue-source/src/zh/UserGuide</sourceFile>
-
<destinationFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide/Master</destinationFile>
+
<sourceFile>${project.build.directory}/existing/zh/UserGuide/Master</sourceFile>
+
<destinationFile>${project.build.directory}/existing/zh/Master</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
- <!-- download lagecy docs from iotdb repo -->
+ <!--install node and npm， then run `npm install` and `npm
run build`-->
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <configuration>
+
<installDirectory>${project.build.directory}/tools</installDirectory>
+
<workingDirectory>${project.build.directory}/vue-source</workingDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install-node-and-npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <nodeVersion>v12.16.2</nodeVersion>
+ <npmVersion>6.14.4</npmVersion>
+ </configuration>
+ </execution>
+ <!-- Install all project dependencies -->
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>compile</phase>
+ <!-- Optional configuration which provides for
running any npm command -->
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <!-- Build and minify static files -->
+ <execution>
+ <id>npm run build</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run build</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <configuration>
+ <!-- mono-module doesn't require site:stage -->
+
<content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
+ <!-- branch where to deploy -->
+ <scmBranch>asf-site</scmBranch>
+ </configuration>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.simplify4u.plugins</groupId>
+ <artifactId>sitemapxml-maven-plugin</artifactId>
+ <version>2.0.0</version>
+ <configuration>
+
<siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
+ <maxDepth>5</maxDepth>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>-->
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-site-0.11</id>
+ <build>
+ <plugins>
+ <!-- download 0.11 docs from iotdb repo -->
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.3.0</version>
<executions>
<execution>
- <id>get-0.10-docs</id>
+ <id>get-0.11-docs</id>
<phase>generate-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
-
<url>https://github.com/apache/iotdb/archive/rel/0.10.zip</url>
+
<url>https://github.com/apache/iotdb/archive/rel/0.11.zip</url>
<outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.10.x.zip</outputFileName>
+ <outputFileName>0.11.x.zip</outputFileName>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <!-- unpack 0.11 docs from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
<execution>
- <id>get-0.9-docs</id>
+ <id>copy-0.11-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+
<directory>${project.build.directory}/download/0.11.x.zip/iotdb-rel-0.11/docs/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.11.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.11-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
<phase>generate-sources</phase>
+ <configuration>
+ <fileset>
+
<directory>${project.build.directory}/download/0.11.x.zip/iotdb-rel-0.11/docs/zh/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.11.x</outputDirectory>
+ </fileset>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- remove files if `existing` folder exist-->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>clean-stale-0.11-doc</id>
+ <phase>compile</phase>
<goals>
- <goal>wget</goal>
+ <goal>rename</goal>
</goals>
<configuration>
-
<url>https://github.com/apache/iotdb/archive/rel/0.9.zip</url>
-
<outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.9.x.zip</outputFileName>
+
<sourceFile>${project.build.directory}/existing/UserGuide/V0.11.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/V0.11.x</destinationFile>
</configuration>
</execution>
<execution>
- <id>get-0.8-docs</id>
+ <id>clean-stale-0.11-zh-doc</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+
<sourceFile>${project.build.directory}/existing/zh/UserGuide/V0.11.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/zh/V0.11.x</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-site-0.10</id>
+ <build>
+ <plugins>
+ <!-- download 0.10 docs from iotdb repo -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <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/iotdb/archive/rel/0.8.zip</url>
+
<url>https://github.com/apache/iotdb/archive/rel/0.10.zip</url>
<outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.8.x.zip</outputFileName>
+ <outputFileName>0.10.x.zip</outputFileName>
</configuration>
</execution>
</executions>
</plugin>
- <!-- unpack lagecy docs from the zip files-->
+ <!-- unpack 0.11 docs from the zip files-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>truezip-maven-plugin</artifactId>
@@ -250,7 +552,7 @@
<phase>generate-sources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/download/0.10.x.zip/incubator-iotdb-rel-0.10/docs/UserGuide</directory>
+
<directory>${project.build.directory}/download/0.10.x.zip/iotdb-rel-0.10/docs/UserGuide</directory>
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.10.x</outputDirectory>
</fileset>
</configuration>
@@ -263,166 +565,224 @@
<phase>generate-sources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/download/0.10.x.zip/incubator-iotdb-rel-0.10/docs/zh/UserGuide</directory>
+
<directory>${project.build.directory}/download/0.10.x.zip/iotdb-rel-0.10/docs/zh/UserGuide</directory>
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.10.x</outputDirectory>
</fileset>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <!-- remove files if `existing` folder exist-->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
<execution>
- <id>copy-0.9-documentation</id>
+ <id>clean-stale-0.10-doc</id>
+ <phase>compile</phase>
<goals>
- <goal>copy</goal>
+ <goal>rename</goal>
</goals>
- <phase>generate-sources</phase>
<configuration>
- <fileset>
-
<directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/UserGuide</directory>
-
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
- </fileset>
+
<sourceFile>${project.build.directory}/existing/UserGuide/V0.10.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/V0.10.x</destinationFile>
</configuration>
</execution>
<execution>
- <id>copy-0.9-zh-documentation</id>
+ <id>clean-stale-0.10-zh-doc</id>
+ <phase>compile</phase>
<goals>
- <goal>copy</goal>
+ <goal>rename</goal>
</goals>
+ <configuration>
+
<sourceFile>${project.build.directory}/existing/zh/UserGuide/V0.10.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/zh/V0.10.x</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-site-0.9</id>
+ <build>
+ <plugins>
+ <!-- download 0.9 docs from iotdb repo -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <executions>
+ <execution>
+ <id>get-0.9-docs</id>
<phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
<configuration>
- <fileset>
-
<directory>${project.build.directory}/download/0.9.x.zip/incubator-iotdb-rel-0.9/docs/zh/UserGuide</directory>
-
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
- </fileset>
+
<url>https://github.com/apache/iotdb/archive/rel/0.9.zip</url>
+
<outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.9.x.zip</outputFileName>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <!-- unpack 0.9 docs from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
<execution>
- <id>copy-0.8-documentation</id>
+ <id>copy-0.9-documentation</id>
<goals>
<goal>copy</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/UserGuide</directory>
-
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
+
<directory>${project.build.directory}/download/0.9.x.zip/iotdb-rel-0.9/docs/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.9.x</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
- <id>copy-0.8-zh-documentation</id>
+ <id>copy-0.9-zh-documentation</id>
<goals>
<goal>copy</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/download/0.8.x.zip/incubator-iotdb-rel-0.8/docs/zh/UserGuide</directory>
-
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
+
<directory>${project.build.directory}/download/0.9.x.zip/iotdb-rel-0.9/docs/zh/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.9.x</outputDirectory>
</fileset>
</configuration>
</execution>
</executions>
</plugin>
- <!-- mv UserGuide of master back -->
+ <!-- remove files if `existing` folder exist-->
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
- <id>mv-master-userguide-to-docs</id>
- <phase>generate-sources</phase>
+ <id>clean-stale-0.9-doc</id>
+ <phase>compile</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
-
<sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
-
<destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
+
<sourceFile>${project.build.directory}/existing/UserGuide/V0.9.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/V0.9.x</destinationFile>
</configuration>
</execution>
<execution>
- <id>mv-master-zh-userguide-to-docs</id>
- <phase>generate-sources</phase>
+ <id>clean-stale-0.9-zh-doc</id>
+ <phase>compile</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
-
<sourceFile>${project.build.directory}/vue-source/src/zh/tmpUserGuide</sourceFile>
-
<destinationFile>${project.build.directory}/vue-source/src/zh/UserGuide</destinationFile>
+
<sourceFile>${project.build.directory}/existing/zh/UserGuide/V0.9.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/zh/V0.9.x</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
- <!--install node and npm， then run `npm install` and `npm
run build`-->
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>compile-site-0.8</id>
+ <build>
+ <plugins>
+ <!-- download 0.8 docs from iotdb repo -->
<plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.9.1</version>
- <configuration>
-
<installDirectory>${project.build.directory}/tools</installDirectory>
-
<workingDirectory>${project.build.directory}/vue-source</workingDirectory>
- </configuration>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.3.0</version>
<executions>
<execution>
- <id>install-node-and-npm</id>
+ <id>get-0.8-docs</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>install-node-and-npm</goal>
+ <goal>wget</goal>
</goals>
- <phase>package</phase>
<configuration>
- <nodeVersion>v12.16.2</nodeVersion>
- <npmVersion>6.14.4</npmVersion>
+
<url>https://github.com/apache/iotdb/archive/rel/0.8.zip</url>
+
<outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.8.x.zip</outputFileName>
</configuration>
</execution>
- <!-- Install all project dependencies -->
+ </executions>
+ </plugin>
+ <!-- unpack 0.8 docs from the zip files-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>truezip-maven-plugin</artifactId>
+ <version>1.2</version>
+ <inherited>false</inherited>
+ <executions>
<execution>
- <id>npm install</id>
+ <id>copy-0.8-documentation</id>
<goals>
- <goal>npm</goal>
+ <goal>copy</goal>
</goals>
- <!-- optional: default phase is
"generate-resources" -->
- <phase>package</phase>
- <!-- Optional configuration which provides for
running any npm command -->
+ <phase>generate-sources</phase>
<configuration>
- <arguments>install</arguments>
+ <fileset>
+
<directory>${project.build.directory}/download/0.8.x.zip/iotdb-rel-0.8/docs/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
</configuration>
</execution>
- <!-- Build and minify static files -->
<execution>
- <id>npm run build</id>
- <phase>package</phase>
+ <id>copy-0.8-zh-documentation</id>
<goals>
- <goal>npm</goal>
+ <goal>copy</goal>
</goals>
+ <phase>generate-sources</phase>
<configuration>
- <arguments>run build</arguments>
+ <fileset>
+
<directory>${project.build.directory}/download/0.8.x.zip/iotdb-rel-0.8/docs/zh/UserGuide</directory>
+
<outputDirectory>${project.build.directory}/vue-source/src/zh/UserGuide/V0.8.x</outputDirectory>
+ </fileset>
</configuration>
</execution>
</executions>
</plugin>
+ <!-- remove files if `existing` folder exist-->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <configuration>
- <!-- mono-module doesn't require site:stage -->
-
<content>${project.build.directory}/vue-source/src/.vuepress/dist</content>
- <!-- branch where to deploy -->
- <scmBranch>asf-site</scmBranch>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.simplify4u.plugins</groupId>
- <artifactId>sitemapxml-maven-plugin</artifactId>
- <version>2.0.0</version>
- <configuration>
-
<siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
- <maxDepth>5</maxDepth>
- </configuration>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
- <phase>package</phase>
+ <id>clean-stale-0.8-doc</id>
+ <phase>compile</phase>
<goals>
- <goal>gen</goal>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+
<sourceFile>${project.build.directory}/existing/UserGuide/V0.8.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/V0.8.x</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>clean-stale-0.8-zh-doc</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>rename</goal>
</goals>
+ <configuration>
+
<sourceFile>${project.build.directory}/existing/zh/UserGuide/V0.8.x</sourceFile>
+
<destinationFile>${project.build.directory}/existing/zh/V0.8.x</destinationFile>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/site/src/main/.vuepress/config.js
b/site/src/main/.vuepress/config.js
index 260f274..db74df2 100644
--- a/site/src/main/.vuepress/config.js
+++ b/site/src/main/.vuepress/config.js
@@ -73,6 +73,7 @@ var config = {
text: 'Document',
items: [
{ text: 'In progress', link:
'/UserGuide/Master/Get Started/QuickStart' },
+ { text: 'V0.11.x', link:
'/UserGuide/V0.11.x/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'},
@@ -394,6 +395,105 @@ var config = {
]
},
],
+ '/UserGuide/V0.11.x/': [
+ {
+ title:'IoTDB User Guide
(V0.11.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/JMX
Tool','JMX Tool'],
+ ['System
Tools/Watermark Tool','Watermark Tool'],
+ ['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'],
+ ['System
Tools/Performance Tracing Tool','Performance Tracing Tool']
+ ]
+ },
+ {
+ 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']
+ ]
+ },
+ {
+ title: 'Comparison with TSDBs',
+ children: [
+
['Comparison/TSDB-Comparison','Comparison']
+ ]
+ }
+ ],
'/UserGuide/Master/': [
{
title:'IoTDB User Guide (In
progress)',
@@ -600,7 +700,8 @@ var config = {
{
text: '文档',
items: [
- { text: 'In progress', link:
'/zh/UserGuide/Master/Get Started/QuickStart' },
+ { text: 'In progress', link:
'/zh/UserGuide/Master/Get Started/QuickStart' },
+ { text: 'V0.11.x', link:
'/zh/UserGuide/V0.11.x/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'},
@@ -915,6 +1016,99 @@ var config = {
]
}
],
+ '/zh/UserGuide/V0.11.x/': [
+ {
+ title: 'IoTDB用户手册 (V0.11.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/JMX
Tool','JMX工具'],
+ ['System
Tools/Watermark Tool','水印工具'],
+ ['System Tools/Query
History Visualization Tool','查询历史可视化工具'],
+ ['System Tools/Monitor
and Log Tools','监控与日志工具'],
+ ['System Tools/Load
External Tsfile','加载外部tsfile文件'],
+ ['System
Tools/Performance Tracing Tool','性能追踪工具']
+ ]
+ },
+ {
+ 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/site/src/main/package.json b/site/src/main/package.json
index ce97f7f..b6a23d2 100644
--- a/site/src/main/package.json
+++ b/site/src/main/package.json
@@ -4,9 +4,9 @@
"description": "Apache IoTDB Website",
"main": "index.js",
"scripts": {
- "dev": "node --max_old_space_size=8000 ./node_modules/vuepress/cli.js dev
src",
- "build": "node --max_old_space_size=8000 ./node_modules/vuepress/cli.js
build src",
- "deploy": "node --max_old_space_size=8000 deploy.js"
+ "dev": "node --max_old_space_size=4000 ./node_modules/vuepress/cli.js dev
src",
+ "build": "node --max_old_space_size=4000 ./node_modules/vuepress/cli.js
build src",
+ "deploy": "node --max_old_space_size=4000 deploy.js"
},
"repository": {
"type": "git",
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index 2b0600c..0ace95a 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.11.0-SNAPSHOT</version>
+ <version>0.12.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 5d846c0..f1cdf8d 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.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/thrift/pom.xml b/thrift/pom.xml
index 55cd184..8ee3873 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-parent</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>iotdb-thrift</artifactId>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index a71fa35..e05e38a 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tsfile</artifactId>
