Merge 34fba4a into c0f23e8

apache · Mar 30, 2020 · 3dfb105 · 3dfb105
2 parents c0f23e8 + 34fba4a
commit 3dfb105
Show file tree

Hide file tree

Showing 55 changed files with 2,762 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -83,3 +83,4 @@ venv/
 partitions.tmp
 partitions
 node_identifier
+
diff --git a/.travis.yml b/.travis.yml
@@ -201,6 +201,13 @@ matrix:
         - mvn post-integration-test -Pcode-coverage 
         - mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,jdbc,server,session,client,hadoop,hive-connector
 
+    - os: linux
+      name: website checker
+      dist: xenial
+      jdk: openjdk8
+      script:
+        - mvn clean package -pl site
+
 cache:
   directories:
     - '$HOME/.m2/repository'

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -135,6 +135,30 @@ pipeline {
             }
         }
 
+        stage('Deploy site') {
+            when {
+                branch 'master'
+            }
+            // Only the nodes labeled 'git-websites' have the credentials to commit to the.
+            agent {
+                node {
+                    label 'git-websites'
+                }
+            }
+            steps {
+                // Unstash the previously stashed site.
+                unstash 'incubator-iotdb-site'
+                // Publish the site with the scm-publish plugin.
+                sh 'mvn scm-publish:publish-scm -pl site'
+
+                // Clean up the snapshots directory (freeing up more space after deploying).
+                dir("target") {
+                    deleteDir()
+                }
+            }
+        }
+
+
         stage('Cleanup') {
             steps {
                 echo 'Cleaning up the workspace'

diff --git a/docs/Development/Development-IDE.md b/docs/Development/Development-IDE.md
@@ -27,7 +27,7 @@ Home Page：https://iotdb.apache.org/
 
 Repository：https://github.com/apache/incubator-iotdb/tree/master
 
-Quick start：http://iotdb.apache.org/document/master/UserGuide/0-Get%20Started/1-QuickStart.html
+Quick start：http://iotdb.apache.org/UserGuide/master/0-Get%20Started/1-QuickStart.html
 
 Jira：https://issues.apache.org/jira/projects/IOTDB/issues/IOTDB-9?filter=allopenissues
 

diff --git a/docs/Download/README.md b/docs/Download/README.md
@@ -0,0 +1,67 @@
+<!--
+
+    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.
+
+-->
+
+# Release version
+
+<table>
+	<tr>
+        <th >Version</th>
+	    <th colspan="3">IoTDB Binaries</th>
+	    <th colspan="3">IoTDB Sources</th>
+	    <th>release notes</th>  
+	</tr >
+    <tr>
+        <td>0.9.1</td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip">Release</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip.asc">ASC</a></td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip">Sources</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip.asc">ASC</a></td>
+        <td><a href="https://raw.githubusercontent.com/apache/incubator-iotdb/release/0.9.1/RELEASE_NOTES.md">release notes</a></td>
+    </tr>
+	<tr >
+        <td>0.8.2</td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip">Release</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/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/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip">Sources</a></td>
+        <td><a href="https://downloads.apache.org/incubator/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/incubator/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/incubator-iotdb/release/0.8.2/RELEASE_NOTES.md">release notes</a></td>
+	</tr>
+
+</table>
+
+
+
+
+# All releases
+
+Find all releases in the [Archive incubating repository](https://archive.apache.org/dist/incubator/iotdb/).
+
+
+
+# Verifying Hashes and Signatures
+
+Along with our releases, we also provide sha512 hashes in *.sha512 files and cryptographic signatures in *.asc files. The Apache Software Foundation has an extensive tutorial to [verify hashes and signatures ](http://www.apache.org/info/verification.html)which you can follow by using any of these release-signing [KEYS ](https://downloads.apache.org/incubator/iotdb/KEYS).
+
+<FooterFixed/>
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,23 @@
+<!--
+
+    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.
+
+-->
+<Home/>
+
+<FooterFixed/>
diff --git a/docs/SystemDesign/0-Architecture/1-Architecture.md b/docs/SystemDesign/0-Architecture/1-Architecture.md
@@ -35,20 +35,20 @@ The server mainly includes a query engine that processes all user requests and d
 
 * [TsFile](../1-TsFile/1-TsFile.html)
 * [QueryEngine](../2-QueryEngine/1-QueryEngine.html)
-* [SchemaManager](/document/master/SystemDesign/3-SchemaManager/1-SchemaManager.html)
-* [StorageEngine](/document/master/SystemDesign/4-StorageEngine/1-StorageEngine.html)
-* [DataQuery](/document/master/SystemDesign/5-DataQuery/1-DataQuery.html)
+* [SchemaManager](/SystemDesign/3-SchemaManager/1-SchemaManager.html)
+* [StorageEngine](/SystemDesign/4-StorageEngine/1-StorageEngine.html)
+* [DataQuery](/SystemDesign/5-DataQuery/1-DataQuery.html)
 
 ## System Tools
 
-* [Data synchronization tool](/document/master/SystemDesign/6-Tools/1-Sync.html)
+* [Data synchronization tool](/SystemDesign/6-Tools/1-Sync.html)
 
 ## Connector
 
 IoTDB is connected with big data systems.
 
 * [Hadoop-TsFile](/#/SystemDesign/progress/chap7/sec1)
-* [Hive-TsFile](/document/master/SystemDesign/7-Connector/2-Hive-TsFile.html)
-* [Spark-TsFile](/document/master/SystemDesign/7-Connector/3-Spark-TsFile.html)
-* [Spark-IoTDB](/document/master/SystemDesign/7-Connector/4-Spark-IOTDB.html)
+* [Hive-TsFile](/SystemDesign/7-Connector/2-Hive-TsFile.html)
+* [Spark-TsFile](/SystemDesign/7-Connector/3-Spark-TsFile.html)
+* [Spark-IoTDB](/SystemDesign/7-Connector/4-Spark-IOTDB.html)
 * [Grafana](/#/SystemDesign/progress/chap7/sec5)
diff --git a/docs/SystemDesign/1-TsFile/1-TsFile.md b/docs/SystemDesign/1-TsFile/1-TsFile.md
@@ -25,6 +25,6 @@ TsFile is the data file of IoTDB.
 
 ## Related
 
-* [File Format](/document/master/SystemDesign/1-TsFile/2-Format.html)
-* [Write Process](/document/master/SystemDesign/1-TsFile/3-Write.html)
-* [Read Process](/document/master/SystemDesign/1-TsFile/4-Read.html)
+* [File Format](/SystemDesign/1-TsFile/2-Format.html)
+* [Write Process](/SystemDesign/1-TsFile/3-Write.html)
+* [Read Process](/SystemDesign/1-TsFile/4-Read.html)
diff --git a/docs/SystemDesign/2-QueryEngine/1-QueryEngine.md b/docs/SystemDesign/2-QueryEngine/1-QueryEngine.md
@@ -60,5 +60,5 @@ The query engine is responsible for parsing all user commands, generating plans,
 
 ## Related documents
 
-* [Query Plan Generator](/document/master/SystemDesign/2-QueryEngine/2-Planner.html)
-* [PlanExecutor](/document/master/SystemDesign/2-QueryEngine/3-PlanExecutor.html)
+* [Query Plan Generator](/SystemDesign/2-QueryEngine/2-Planner.html)
+* [PlanExecutor](/SystemDesign/2-QueryEngine/3-PlanExecutor.html)
diff --git a/docs/SystemDesign/4-StorageEngine/1-StorageEngine.md b/docs/SystemDesign/4-StorageEngine/1-StorageEngine.md
@@ -51,7 +51,7 @@ In addition, the storage engine includes asynchronous persistence and file merge
 
 ## Data write
 See details:
-* [Data write](/document/master/SystemDesign/4-StorageEngine/6-DataManipulation.html)
+* [Data write](/SystemDesign/4-StorageEngine/6-DataManipulation.html)
 
 ## Data access
 
@@ -61,8 +61,8 @@ See details:
 
 ## Related documents
 
-* [Write Ahead Log (WAL)](/document/master/SystemDesign/4-StorageEngine/2-WAL.html)
+* [Write Ahead Log (WAL)](/SystemDesign/4-StorageEngine/2-WAL.html)
 
-* [memtable Endurance](/document/master/SystemDesign/4-StorageEngine/3-FlushManager.html)
+* [memtable Endurance](/SystemDesign/4-StorageEngine/3-FlushManager.html)
 
-* [File merge mechanism](/document/master/SystemDesign/4-StorageEngine/4-MergeManager.html)
+* [File merge mechanism](/SystemDesign/4-StorageEngine/4-MergeManager.html)
diff --git a/docs/SystemDesign/4-StorageEngine/6-DataManipulation.md b/docs/SystemDesign/4-StorageEngine/6-DataManipulation.md
@@ -63,7 +63,7 @@ The following describes four common data manipulation operations, which are inse
 Currently does not support data in-place update operations, that is, update statements, but users can directly insert new data, the same time series at the same time point is based on the latest inserted data.
 Old data is automatically deleted by merging, see:
 
-* [File merge mechanism](/document/master/SystemDesign/4-StorageEngine/4-MergeManager.html)
+* [File merge mechanism](/SystemDesign/4-StorageEngine/4-MergeManager.html)
 
 ## Data deletion
 

diff --git a/docs/SystemDesign/5-DataQuery/1-DataQuery.md b/docs/SystemDesign/5-DataQuery/1-DataQuery.md
@@ -33,8 +33,8 @@ In order to achieve the above kinds of queries, a basic query component for a si
 
 ## Related documents
 
-* [Basic query components](/document/master/SystemDesign/5-DataQuery/2-SeriesReader.html)
-* [Raw data query](/document/master/SystemDesign/5-DataQuery/3-RawDataQuery.html)
-* [Aggregate query](/document/master/SystemDesign/5-DataQuery/4-AggregationQuery.html)
-* [Downsampling query](/document/master/SystemDesign/5-DataQuery/5-GroupByQuery.html)
-* [Recent timestamp query](/document/master/SystemDesign/5-DataQuery/6-LastQuery.html)
+* [Basic query components](/SystemDesign/5-DataQuery/2-SeriesReader.html)
+* [Raw data query](/SystemDesign/5-DataQuery/3-RawDataQuery.html)
+* [Aggregate query](/SystemDesign/5-DataQuery/4-AggregationQuery.html)
+* [Downsampling query](/SystemDesign/5-DataQuery/5-GroupByQuery.html)
+* [Recent timestamp query](/SystemDesign/5-DataQuery/6-LastQuery.html)
diff --git a/docs/SystemDesign/5-DataQuery/7-AlignByDeviceQuery.md b/docs/SystemDesign/5-DataQuery/7-AlignByDeviceQuery.md
@@ -64,7 +64,7 @@ The following will be explained according to the specific process:
 
 Unlike the original data query, the alignment by device query does not concatenate the suffix paths in the SELECT statement and the WHERE statement at this stage, but when the physical plan is subsequently generated, the mapping value and filter conditions corresponding to each device are calculated.  Therefore, the work done at this stage by device alignment only includes optimization of filter conditions in WHERE statements.
 
-The optimization of the filtering conditions mainly includes three parts: removing the negation, transforming the disjunction paradigm, and merging the same path filtering conditions.  The corresponding optimizers are: RemoveNotOptimizer, DnfFilterOptimizer, MergeSingleFilterOptimizer.  This part of the logic can refer to:[Planner](/document/master/SystemDesign/2-QueryEngine/2-Planner.html).
+The optimization of the filtering conditions mainly includes three parts: removing the negation, transforming the disjunction paradigm, and merging the same path filtering conditions.  The corresponding optimizers are: RemoveNotOptimizer, DnfFilterOptimizer, MergeSingleFilterOptimizer.  This part of the logic can refer to:[Planner](/SystemDesign/2-QueryEngine/2-Planner.html).
 
 ### Physical plan generation
 

diff --git a/docs/zh/Development/ContributeGuide.md b/docs/zh/Development/ContributeGuide.md
@@ -27,7 +27,7 @@ IoTDB 官网：https://iotdb.apache.org/
 
 代码库：https://github.com/apache/incubator-iotdb/tree/master
 
-快速上手：http://iotdb.apache.org/document/master/UserGuide/0-Get%20Started/1-QuickStart.html
+快速上手：http://iotdb.apache.org/UserGuide/master/0-Get%20Started/1-QuickStart.html
 
 Jira 任务管理：https://issues.apache.org/jira/projects/IOTDB/issues/IOTDB-9?filter=allopenissues
 

diff --git a/docs/zh/Download/README.md b/docs/zh/Download/README.md
@@ -0,0 +1,66 @@
+<!--
+
+    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.
+
+-->
+# 发行版本
+
+<table>
+	<tr>
+        <th >Version</th>
+	    <th colspan="3">IoTDB Binaries</th>
+	    <th colspan="3">IoTDB Sources</th>
+	    <th>release notes</th>  
+	</tr >
+    <tr>
+        <td>0.9.1</td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip">Release</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-bin.zip.asc">ASC</a></td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip">Sources</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.9.1-incubating/apache-iotdb-0.9.1-incubating-source-release.zip.asc">ASC</a></td>
+        <td><a href="https://raw.githubusercontent.com/apache/incubator-iotdb/release/0.9.1/RELEASE_NOTES.md">release notes</a></td>
+    </tr>
+	<tr >
+        <td>0.8.2</td>
+        <td><a href="https://www.apache.org/dyn/closer.cgi/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip">Release</a></td>
+        <td><a href="https://downloads.apache.org/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-bin.zip.sha512">SHA512</a></td>
+        <td><a href="https://downloads.apache.org/incubator/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/incubator/iotdb/0.8.2-incubating/apache-iotdb-0.8.2-incubating-source-release.zip">Sources</a></td>
+        <td><a href="https://downloads.apache.org/incubator/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/incubator/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/incubator-iotdb/release/0.8.2/RELEASE_NOTES.md">release notes</a></td>
+	</tr>
+
+</table>
+
+
+
+
+# 所有版本
+
+在 [Archive incubating repository](https://archive.apache.org/dist/incubator/iotdb/)查看所有版本
+
+
+
+# 验证哈希和签名
+
+除了我们的发行版，我们还在* .sha512文件中提供了sha512散列，并在* .asc文件中提供了加密签名。  Apache Software Foundation提供了广泛的教程来 [验证哈希和签名](http://www.apache.org/info/verification.html)，您可以使用任何这些发布签名的[KEYS](https://downloads.apache.org/incubator/iotdb/KEYS)来遵循这些哈希和签名。
+
+<FooterFixed/>
diff --git a/docs/zh/README.md b/docs/zh/README.md
@@ -0,0 +1,23 @@
+<!--
+
+    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.
+
+-->
+<Home_zh/>
+
+<FooterFixed/>
diff --git a/docs/zh/SystemDesign/2-QueryEngine/1-QueryEngine.md b/docs/zh/SystemDesign/2-QueryEngine/1-QueryEngine.md
@@ -60,5 +60,5 @@
 
 ## 相关文档
 
-* [查询计划生成器](/zh/document/master/SystemDesign/2-QueryEngine/2-Planner.html)
-* [计划执行器](/zh/document/master/SystemDesign/2-QueryEngine/3-PlanExecutor.html)
+* [查询计划生成器](/zh/SystemDesign/2-QueryEngine/2-Planner.html)
+* [计划执行器](/zh/SystemDesign/2-QueryEngine/3-PlanExecutor.html)
diff --git a/docs/zh/SystemDesign/4-StorageEngine/1-StorageEngine.md b/docs/zh/SystemDesign/4-StorageEngine/1-StorageEngine.md
@@ -49,7 +49,7 @@
 
 ## 数据写入
 详见：
-* [数据写入](/zh/document/master/SystemDesign/4-StorageEngine/6-DataManipulation.html)
+* [数据写入](/zh/SystemDesign/4-StorageEngine/6-DataManipulation.html)
 
 ## 数据访问
 
@@ -60,8 +60,8 @@
 
 ## 相关文档
 
-* [写前日志 (WAL)](/zh/document/master/SystemDesign/4-StorageEngine/2-WAL.html)
+* [写前日志 (WAL)](/zh/SystemDesign/4-StorageEngine/2-WAL.html)
 
-* [memtable 持久化](/zh/document/master/SystemDesign/4-StorageEngine/3-FlushManager.html)
+* [memtable 持久化](/zh/SystemDesign/4-StorageEngine/3-FlushManager.html)
 
-* [文件合并机制](/zh/document/master/SystemDesign/4-StorageEngine/4-MergeManager.html)
+* [文件合并机制](/zh/SystemDesign/4-StorageEngine/4-MergeManager.html)
diff --git a/docs/zh/SystemDesign/4-StorageEngine/6-DataManipulation.md b/docs/zh/SystemDesign/4-StorageEngine/6-DataManipulation.md
@@ -64,7 +64,7 @@
 目前不支持数据的原地更新操作，即update语句，但用户可以直接插入新的数据，在同一个时间点上的同一个时间序列以最新插入的数据为准
 旧数据会通过合并来自动删除，参见：
 
-* [文件合并机制](/zh/document/master/SystemDesign/4-StorageEngine/4-MergeManager.html)
+* [文件合并机制](/zh/SystemDesign/4-StorageEngine/4-MergeManager.html)
 
 ## 数据删除