You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/03/30 03:55:50 UTC
[incubator-iotdb] 02/02: fix incorrect urls in docs
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit da694401c5db916face9096984c466520b9de36d
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Mar 30 11:55:31 2020 +0800
fix incorrect urls in docs
---
docs/Development/Development-IDE.md | 2 +-
docs/Download/README.md | 67 ++++++++++++++++++++++
{site/src/main => docs}/README.md | 5 --
docs/SystemDesign/0-Architecture/1-Architecture.md | 14 ++---
docs/SystemDesign/1-TsFile/1-TsFile.md | 6 +-
docs/SystemDesign/2-QueryEngine/1-QueryEngine.md | 4 +-
.../4-StorageEngine/1-StorageEngine.md | 8 +--
.../4-StorageEngine/6-DataManipulation.md | 2 +-
docs/SystemDesign/5-DataQuery/1-DataQuery.md | 10 ++--
.../5-DataQuery/7-AlignByDeviceQuery.md | 2 +-
docs/zh/Development/ContributeGuide.md | 2 +-
docs/zh/Download/README.md | 66 +++++++++++++++++++++
{site/src/main => docs/zh}/README.md | 11 +---
.../zh/SystemDesign/2-QueryEngine/1-QueryEngine.md | 4 +-
.../4-StorageEngine/1-StorageEngine.md | 8 +--
.../4-StorageEngine/6-DataManipulation.md | 2 +-
docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 10 ++--
{site/src/main => docs/zh/UserGuide}/README.md | 7 +--
site/src/main/.vuepress/components/Contributor.vue | 32 +++++------
site/src/main/.vuepress/components/FooterFixed.vue | 32 +++++------
site/src/main/.vuepress/components/Home.vue | 36 ++++++------
site/src/main/.vuepress/components/Home_zh.vue | 36 ++++++------
site/src/main/.vuepress/components/Valine.vue | 32 +++++------
site/src/main/.vuepress/config.js | 32 +++++------
site/src/main/.vuepress/enhanceApp.js | 32 +++++------
site/src/main/.vuepress/override.styl | 32 +++++------
site/src/main/.vuepress/public/css/index.css | 18 ------
site/src/main/.vuepress/style.styl | 31 +++++-----
site/src/main/.vuepress/styles/palette.styl | 14 ++---
site/src/main/deploy.js | 2 +-
30 files changed, 331 insertions(+), 228 deletions(-)
diff --git a/docs/Development/Development-IDE.md b/docs/Development/Development-IDE.md
index 36c70cc..e82822a 100644
--- 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
new file mode 100644
index 0000000..580d9b8
--- /dev/null
+++ 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/>
\ No newline at end of file
diff --git a/site/src/main/README.md b/docs/README.md
similarity index 95%
copy from site/src/main/README.md
copy to docs/README.md
index ca2a796..0dce55f 100644
--- a/site/src/main/README.md
+++ b/docs/README.md
@@ -18,11 +18,6 @@
under the License.
-->
-
----
-home: true
----
-
<Home/>
<FooterFixed/>
\ No newline at end of file
diff --git a/docs/SystemDesign/0-Architecture/1-Architecture.md b/docs/SystemDesign/0-Architecture/1-Architecture.md
index f7e5c27..35dd2d4 100644
--- 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
index d6a98f1..016fabf 100644
--- 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
index 56b53af..4d73f13 100644
--- 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
index cee1b8c..0f0b549 100644
--- 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
index e8ea43c..60d6253 100644
--- 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
index f429efe..37222ff 100644
--- 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
index 1d0477e..2abda4f 100644
--- 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
index a308f78..054a233 100644
--- 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
new file mode 100644
index 0000000..71b53a5
--- /dev/null
+++ 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/>
\ No newline at end of file
diff --git a/site/src/main/README.md b/docs/zh/README.md
similarity index 94%
copy from site/src/main/README.md
copy to docs/zh/README.md
index ca2a796..7b7fe8a 100644
--- a/site/src/main/README.md
+++ b/docs/zh/README.md
@@ -7,9 +7,9 @@
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
@@ -18,11 +18,6 @@
under the License.
-->
-
----
-home: true
----
-
-<Home/>
+<Home_zh/>
<FooterFixed/>
\ No newline at end of file
diff --git a/docs/zh/SystemDesign/2-QueryEngine/1-QueryEngine.md b/docs/zh/SystemDesign/2-QueryEngine/1-QueryEngine.md
index 890b72f..5610bf7 100644
--- 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)
\ No newline at end of file
+* [查询计划生成器](/zh/SystemDesign/2-QueryEngine/2-Planner.html)
+* [计划执行器](/zh/SystemDesign/2-QueryEngine/3-PlanExecutor.html)
\ No newline at end of file
diff --git a/docs/zh/SystemDesign/4-StorageEngine/1-StorageEngine.md b/docs/zh/SystemDesign/4-StorageEngine/1-StorageEngine.md
index 4ae6e05..ec9df0b 100644
--- 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)
\ No newline at end of file
+* [文件合并机制](/zh/SystemDesign/4-StorageEngine/4-MergeManager.html)
\ No newline at end of file
diff --git a/docs/zh/SystemDesign/4-StorageEngine/6-DataManipulation.md b/docs/zh/SystemDesign/4-StorageEngine/6-DataManipulation.md
index f9db63b..8b60018 100644
--- 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)
## 数据删除
diff --git a/docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md b/docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md
index 5377112..0ace265 100644
--- a/docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md
+++ b/docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md
@@ -33,8 +33,8 @@
## 相关文档
-* [基础查询组件](/zh/document/master/SystemDesign/5-DataQuery/2-SeriesReader.html)
-* [原始数据查询](/zh/document/master/SystemDesign/5-DataQuery/3-RawDataQuery.html)
-* [聚合查询](/zh/document/master/SystemDesign/5-DataQuery/4-AggregationQuery.html)
-* [降采样查询](/zh/document/master/SystemDesign/5-DataQuery/5-GroupByQuery.html)
-* [最近时间戳查询](/zh/document/master/SystemDesign/5-DataQuery/6-LastQuery.html)
+* [基础查询组件](/zh/SystemDesign/5-DataQuery/2-SeriesReader.html)
+* [原始数据查询](/zh/SystemDesign/5-DataQuery/3-RawDataQuery.html)
+* [聚合查询](/zh/SystemDesign/5-DataQuery/4-AggregationQuery.html)
+* [降采样查询](/zh/SystemDesign/5-DataQuery/5-GroupByQuery.html)
+* [最近时间戳查询](/zh/SystemDesign/5-DataQuery/6-LastQuery.html)
diff --git a/site/src/main/README.md b/docs/zh/UserGuide/README.md
similarity index 96%
rename from site/src/main/README.md
rename to docs/zh/UserGuide/README.md
index ca2a796..7575794 100644
--- a/site/src/main/README.md
+++ b/docs/zh/UserGuide/README.md
@@ -7,9 +7,9 @@
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
@@ -18,11 +18,10 @@
under the License.
-->
-
---
home: true
---
-<Home/>
+<Home_zh/>
<FooterFixed/>
\ No newline at end of file
diff --git a/site/src/main/.vuepress/components/Contributor.vue b/site/src/main/.vuepress/components/Contributor.vue
index 5f957df..576f7aa 100644
--- a/site/src/main/.vuepress/components/Contributor.vue
+++ b/site/src/main/.vuepress/components/Contributor.vue
@@ -1,21 +1,21 @@
/*
- 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
+* 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.
+*/
- 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.
- */
<template>
<div>
<h1 style="text-align: center;">Project Committers</h1>
diff --git a/site/src/main/.vuepress/components/FooterFixed.vue b/site/src/main/.vuepress/components/FooterFixed.vue
index 1236e77..b55fd4b 100644
--- a/site/src/main/.vuepress/components/FooterFixed.vue
+++ b/site/src/main/.vuepress/components/FooterFixed.vue
@@ -1,21 +1,21 @@
/*
- 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
+* 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.
+*/
- 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.
- */
<template>
<div style="margin-top:120px;
height: 10px;
diff --git a/site/src/main/.vuepress/components/Home.vue b/site/src/main/.vuepress/components/Home.vue
index 824877b..3cbc739 100644
--- a/site/src/main/.vuepress/components/Home.vue
+++ b/site/src/main/.vuepress/components/Home.vue
@@ -1,21 +1,21 @@
/*
- 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
+* 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.
+*/
- 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.
- */
<template >
<div style="background:linear-gradient(top,#A2A2A2,#fff);">
@@ -204,10 +204,10 @@ export default {
},
addRoutes1() {
- this.$router.push("/download/");
+ this.$router.push("/Download/");
},
addRoutes2() {
- this.$router.push("/document/V0.9.x/UserGuide/1-Overview/1-What%20is%20IoTDB.html");
+ this.$router.push("/UserGuide/V0.9.x/1-Overview/1-What%20is%20IoTDB.html");
}
}
};
diff --git a/site/src/main/.vuepress/components/Home_zh.vue b/site/src/main/.vuepress/components/Home_zh.vue
index c3dcafc..7a0beae 100644
--- a/site/src/main/.vuepress/components/Home_zh.vue
+++ b/site/src/main/.vuepress/components/Home_zh.vue
@@ -1,21 +1,21 @@
/*
- 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
+* 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.
+*/
- 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.
- */
<template >
<div style="background:linear-gradient(top,#A2A2A2,#fff);">
@@ -198,10 +198,10 @@ export default {
},
addRoutes1() {
- this.$router.push("/zh/download/");
+ this.$router.push("/zh/Download/");
},
addRoutes2() {
- this.$router.push("/zh/document/V0.9.x/UserGuide/1-Overview/1-What%20is%20IoTDB.html");
+ this.$router.push("/zh/UserGuide/V0.9.x/1-Overview/1-What%20is%20IoTDB.html");
}
}
};
diff --git a/site/src/main/.vuepress/components/Valine.vue b/site/src/main/.vuepress/components/Valine.vue
index 6200eba..5067388 100644
--- a/site/src/main/.vuepress/components/Valine.vue
+++ b/site/src/main/.vuepress/components/Valine.vue
@@ -1,21 +1,21 @@
/*
- 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
+* 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.
+*/
- 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.
- */
<template>
<div>
<div id="vcomments"></div>
diff --git a/site/src/main/.vuepress/config.js b/site/src/main/.vuepress/config.js
index 018acfc..02fd4fa 100644
--- a/site/src/main/.vuepress/config.js
+++ b/site/src/main/.vuepress/config.js
@@ -1,21 +1,21 @@
/*
- 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.
+ * 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.
*/
+
var config = {
head: [
['link', { rel: 'icon', href: '/favicon.ico' }],
diff --git a/site/src/main/.vuepress/enhanceApp.js b/site/src/main/.vuepress/enhanceApp.js
index b4f5f34..6ffe4c4 100644
--- a/site/src/main/.vuepress/enhanceApp.js
+++ b/site/src/main/.vuepress/enhanceApp.js
@@ -1,21 +1,21 @@
/*
- 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.
+ * 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.
*/
+
/**
* 扩展 VuePress 应用
*/
diff --git a/site/src/main/.vuepress/override.styl b/site/src/main/.vuepress/override.styl
index fdd9cd2..e7aabf3 100644
--- a/site/src/main/.vuepress/override.styl
+++ b/site/src/main/.vuepress/override.styl
@@ -1,20 +1,20 @@
/*
- 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.
+ * 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.
*/
+
$contentWidth = 2000px
$sidebarWidth = 20rem
\ No newline at end of file
diff --git a/site/src/main/.vuepress/public/css/index.css b/site/src/main/.vuepress/public/css/index.css
index f2f406a..1173fbe 100644
--- a/site/src/main/.vuepress/public/css/index.css
+++ b/site/src/main/.vuepress/public/css/index.css
@@ -1,21 +1,3 @@
-/*
- 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.
- */
.red{
color:red;
}
diff --git a/site/src/main/.vuepress/style.styl b/site/src/main/.vuepress/style.styl
index 3c5e51a..8f99b04 100644
--- a/site/src/main/.vuepress/style.styl
+++ b/site/src/main/.vuepress/style.styl
@@ -1,18 +1,17 @@
/*
- 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.
+ * 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.
*/
\ No newline at end of file
diff --git a/site/src/main/.vuepress/styles/palette.styl b/site/src/main/.vuepress/styles/palette.styl
index ea76f22..ab044b1 100644
--- a/site/src/main/.vuepress/styles/palette.styl
+++ b/site/src/main/.vuepress/styles/palette.styl
@@ -7,15 +7,15 @@
* "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
+ * 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.
+ * 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.
*/
+
// 颜色
$accentColor = #3eaf7c
$textColor = #2c3e50
diff --git a/site/src/main/deploy.js b/site/src/main/deploy.js
index 98bb0ff..8ffe728 100644
--- a/site/src/main/deploy.js
+++ b/site/src/main/deploy.js
@@ -19,7 +19,7 @@
var ghpages = require('gh-pages');
-ghpages.publish('src/.vuepress/dist', {
+ghpages.publish('docs/.vuepress/dist', {
branch: 'asf-site',
repo: 'https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git'
});