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/04/05 00:50:29 UTC
[incubator-iotdb] branch optimize_travis updated (c0843b3 ->
ea4563b)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from c0843b3 optimize travis to reduce unnecessary test and enhance the readability
add 130810b [IOTDB-572] Skip Chinese Tests if the server does not support Chinese (#965)
add bdcd053 modify development & community (#963)
add c479ef7 add apache-rat for css files (#967)
add 24b3d14 fix jenkins
add 053d6ab fix jenkins
add c6c23a3 Fix visible metadata, version, work processor bugs when recovering (#966)
add 7d350ba rollback TimeGenerator (#964)
add 3f427f9 fix javadoc format
add 9c1ac1d modify config.js zh/development (#969)
add a5eba32 add timegenerator test (#971)
add a8f439b update last doc (#972)
add 6797b44 rename some methods and move the load related methods to FileLoaderUtil class
add 25cb550 rename some methods and move the load related methods to FileLoaderUtil class (#974)
add 8592180 Fix bugs of set core-site.xml and hdfs-site.xml paths in HDFS storage (#973)
add 5c27e55 add tsfile new format figure (#978)
add fbd027d change sensor to measurement (#977)
add e7a8fe6 update tsfile format figure
add f945114 modify vue home (#976)
add 2992a9d add docs for deletion handle in query (#980)
add 385bdcb Replace the Badge of codecov to coveralls (#984)
add 4e288af [IOTDB-576] Use SessionPool for Flink Connector instead of Session (#982)
add 8b3fcb2 Make JDBC OSGi usable and added a feature file (#952)
new 1f8f41a Merge remote-tracking branch 'origin/master' into optimize_travis
new ea4563b make site available only when use -Pwebsite command
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 15 +-
Jenkinsfile | 4 +-
README.md | 4 +-
docs/Community/Community-History&Vision.md | 6 +-
docs/Community/Community-Powered By.md | 10 +-
docs/Community/Community-Project Committers.md | 33 +-
docs/Development/ContributeGuide.md | 101 +++
docs/Development/Development-Contributing.md | 214 -------
docs/Development/Development-Document.md | 51 --
docs/Development/Development-IDE.md | 113 ----
docs/{zh => }/Development/VoteRelease.md | 84 +--
docs/SystemDesign/1-TsFile/2-Format.md | 24 +-
docs/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 63 ++
.../2-DML Data Manipulation Language.md | 34 +-
.../{ => zh}/Community/Community-History&Vision.md | 0
docs/{ => zh}/Community/Community-Powered By.md | 0
.../Community-Project Committers.md} | 4 +-
docs/zh/Development/ContributeGuide.md | 6 +-
docs/zh/SystemDesign/1-TsFile/2-Format.md | 24 +-
docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 63 ++
.../2-DML Data Manipulation Language.md | 27 +-
example/kafka/readme.md | 2 +-
example/rocketmq/readme.md | 8 +-
.../main/java/org/apache/iotdb/SessionExample.java | 1 -
.../java/org/apache/iotdb/flink/IoTDBSink.java | 32 +-
.../iotdb/flink/IoTDBSinkBatchInsertTest.java | 22 +-
.../iotdb/flink/IoTDBSinkBatchTimerTest.java | 14 +-
.../apache/iotdb/flink/IoTDBSinkInsertTest.java | 12 +-
hadoop/README.md | 2 +-
hadoop/pom.xml | 55 ++
jdbc/README.md | 23 +
jdbc/osgi.bnd | 31 +
jdbc/pom.xml | 97 +++
jdbc/src/main/feature/feature.xml | 35 ++
.../main/java/org/apache/iotdb/jdbc/Activator.java | 40 ++
.../org/apache/iotdb/jdbc/IoTDBDataSource.java | 146 +++++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +-
.../java/org/apache/iotdb/jdbc/IoTDBDriver.java | 4 +-
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 92 ++-
.../apache/iotdb/jdbc/IoTDbDataSourceFactory.java | 79 +++
.../resources/services/META-INF/java.sql.Driver | 6 +-
pom.xml | 5 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 95 +--
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../db/engine/storagegroup/TsFileResource.java | 49 ++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 55 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 12 +-
.../groupby/GroupByWithValueFilterDataSet.java | 2 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 2 +-
.../db/query/executor/AggregationExecutor.java | 12 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 2 +-
.../db/query/executor/RawDataQueryExecutor.java | 4 +-
.../adapter/ByTimestampReaderAdapter.java | 46 +-
.../db/query/reader/chunk/ChunkReaderWrap.java | 4 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 5 +-
.../reader/chunk/DiskChunkReaderByTimestamp.java | 55 +-
.../db/query/reader/chunk/MemChunkLoader.java | 5 +-
.../db/query/reader/chunk/MemChunkReader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 2 +-
.../db/query/reader/series/IReaderByTimestamp.java | 14 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 34 +-
.../reader/series/SeriesReaderByTimestamp.java | 24 +-
.../query/timegenerator/ServerTimeGenerator.java | 2 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 44 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 1 +
.../writelog/recover/TsFileRecoverPerformer.java | 7 +-
.../conf/adapter/ActiveTimeSeriesCounterTest.java | 10 +-
...yMergeTest.java => IoTDBFlushQueryMergeIT.java} | 2 +-
...ileTest.java => IoTDBLoadExternalTsfileIT.java} | 4 +-
.../iotdb/db/integration/IoTDBRestartIT.java | 87 +++
...impleQueryTest.java => IoTDBSimpleQueryIT.java} | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 5 +
.../db/writelog/recover/SeqTsFileRecoverTest.java | 4 +
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
service-rpc/pom.xml | 55 ++
.../org/apache/iotdb/session/IoTDBSessionIT.java | 8 +
site/README.md | 2 +-
site/pom.xml | 691 +++++++++++----------
site/src/main/.vuepress/components/Home.vue | 17 +-
site/src/main/.vuepress/components/Home_zh.vue | 17 +-
site/src/main/.vuepress/config.js | 4 +-
site/src/main/.vuepress/public/css/index.css | 21 +-
tsfile/pom.xml | 55 ++
.../tsfile/file/metadata/ChunkGroupMetadata.java | 26 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 4 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 70 +--
.../read/controller/CachedChunkLoaderImpl.java | 4 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 6 +-
.../read/controller/IChunkMetadataLoader.java | 2 +-
.../read/query/timegenerator/TimeGenerator.java | 36 +-
.../read/query/timegenerator/node/AndNode.java | 99 +--
.../read/query/timegenerator/node/LeafNode.java | 65 +-
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 119 ++--
.../iotdb/tsfile/read/reader/IChunkReader.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../read/reader/series/FileSeriesReader.java | 2 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +-
.../write/writer/RestorableTsFileIOWriter.java | 47 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 90 +--
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 30 +-
...BatchReader.java => FakedMultiBatchReader.java} | 41 +-
.../tsfile/read/reader/FakedTimeGenerator.java | 73 +++
109 files changed, 2221 insertions(+), 1588 deletions(-)
create mode 100644 docs/Development/ContributeGuide.md
delete mode 100644 docs/Development/Development-Contributing.md
delete mode 100644 docs/Development/Development-Document.md
delete mode 100644 docs/Development/Development-IDE.md
copy docs/{zh => }/Development/VoteRelease.md (69%)
create mode 100644 docs/SystemDesign/5-DataQuery/8-ModificationHandle.md
copy docs/{ => zh}/Community/Community-History&Vision.md (100%)
copy docs/{ => zh}/Community/Community-Powered By.md (100%)
copy docs/zh/{UserGuide/3-Server/3-Cluster Setup.md => Community/Community-Project Committers.md} (96%)
create mode 100644 docs/zh/SystemDesign/5-DataQuery/8-ModificationHandle.md
create mode 100644 jdbc/osgi.bnd
create mode 100644 jdbc/src/main/feature/feature.xml
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/Activator.java
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDataSource.java
create mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDbDataSourceFactory.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java => jdbc/src/main/resources/services/META-INF/java.sql.Driver (90%)
rename server/src/test/java/org/apache/iotdb/db/integration/{IoTDBFlushQueryMergeTest.java => IoTDBFlushQueryMergeIT.java} (99%)
rename server/src/test/java/org/apache/iotdb/db/integration/{IoTDBLoadExternalTsfileTest.java => IoTDBLoadExternalTsfileIT.java} (99%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBRestartIT.java
rename server/src/test/java/org/apache/iotdb/db/integration/{IoTDBSimpleQueryTest.java => IoTDBSimpleQueryIT.java} (99%)
copy service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBConnectionException.java => tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkGroupMetadata.java (60%)
copy tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/{FakedBatchReader.java => FakedMultiBatchReader.java} (59%)
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/reader/FakedTimeGenerator.java
[incubator-iotdb] 01/02: Merge remote-tracking branch
'origin/master' into optimize_travis
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1f8f41a3fb9cec6b5162ce75148d5dc97ace56f4
Merge: c0843b3 8b3fcb2
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 08:43:46 2020 +0800
Merge remote-tracking branch 'origin/master' into optimize_travis
Jenkinsfile | 4 +-
README.md | 4 +-
docs/Community/Community-History&Vision.md | 6 +-
docs/Community/Community-Powered By.md | 10 +-
docs/Community/Community-Project Committers.md | 33 +---
docs/Development/ContributeGuide.md | 101 ++++++++++
docs/Development/Development-Contributing.md | 214 ---------------------
docs/Development/Development-Document.md | 51 -----
docs/Development/Development-IDE.md | 113 -----------
docs/Development/VoteRelease.md | 202 +++++++++++++++++++
docs/SystemDesign/1-TsFile/2-Format.md | 24 ++-
docs/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 63 ++++++
.../2-DML Data Manipulation Language.md | 34 ++--
.../{ => zh}/Community/Community-History&Vision.md | 0
docs/{ => zh}/Community/Community-Powered By.md | 0
.../Community/Community-Project Committers.md} | 8 +-
docs/zh/Development/ContributeGuide.md | 6 +-
docs/zh/SystemDesign/1-TsFile/2-Format.md | 24 ++-
docs/zh/SystemDesign/5-DataQuery/1-DataQuery.md | 3 +
.../5-DataQuery/8-ModificationHandle.md | 63 ++++++
.../2-DML Data Manipulation Language.md | 27 +--
example/kafka/readme.md | 2 +-
example/rocketmq/readme.md | 8 +-
.../main/java/org/apache/iotdb/SessionExample.java | 1 -
.../java/org/apache/iotdb/flink/IoTDBSink.java | 32 +--
.../iotdb/flink/IoTDBSinkBatchInsertTest.java | 22 +--
.../iotdb/flink/IoTDBSinkBatchTimerTest.java | 14 +-
.../apache/iotdb/flink/IoTDBSinkInsertTest.java | 12 +-
hadoop/README.md | 2 +-
hadoop/pom.xml | 55 ++++++
jdbc/README.md | 23 +++
jdbc/osgi.bnd | 31 +++
jdbc/pom.xml | 97 ++++++++++
jdbc/src/main/feature/feature.xml | 35 ++++
.../main/java/org/apache/iotdb/jdbc/Activator.java | 40 ++++
.../org/apache/iotdb/jdbc/IoTDBDataSource.java | 146 ++++++++++++++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 11 +-
.../java/org/apache/iotdb/jdbc/IoTDBDriver.java | 4 +-
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 92 ++++++++-
.../apache/iotdb/jdbc/IoTDbDataSourceFactory.java | 79 ++++++++
.../resources/services/META-INF/java.sql.Driver | 14 +-
pom.xml | 5 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 95 ++-------
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../db/engine/storagegroup/TsFileResource.java | 49 +++++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 55 +++---
.../db/qp/physical/crud/RawDataQueryPlan.java | 12 +-
.../groupby/GroupByWithValueFilterDataSet.java | 2 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 2 +-
.../db/query/executor/AggregationExecutor.java | 12 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 2 +-
.../db/query/executor/RawDataQueryExecutor.java | 4 +-
.../adapter/ByTimestampReaderAdapter.java | 46 ++---
.../db/query/reader/chunk/ChunkReaderWrap.java | 4 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 5 +-
.../reader/chunk/DiskChunkReaderByTimestamp.java | 55 +++---
.../db/query/reader/chunk/MemChunkLoader.java | 5 +-
.../db/query/reader/chunk/MemChunkReader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../chunk/metadata/MemChunkMetadataLoader.java | 2 +-
.../db/query/reader/series/IReaderByTimestamp.java | 14 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 34 +---
.../reader/series/SeriesReaderByTimestamp.java | 24 +--
.../query/timegenerator/ServerTimeGenerator.java | 2 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 44 ++++-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 1 +
.../writelog/recover/TsFileRecoverPerformer.java | 7 +-
.../conf/adapter/ActiveTimeSeriesCounterTest.java | 10 +-
...yMergeTest.java => IoTDBFlushQueryMergeIT.java} | 2 +-
...ileTest.java => IoTDBLoadExternalTsfileIT.java} | 4 +-
.../iotdb/db/integration/IoTDBRestartIT.java | 87 +++++++++
...impleQueryTest.java => IoTDBSimpleQueryIT.java} | 2 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 5 +
.../db/writelog/recover/SeqTsFileRecoverTest.java | 4 +
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
service-rpc/pom.xml | 55 ++++++
.../org/apache/iotdb/session/IoTDBSessionIT.java | 8 +
site/src/main/.vuepress/components/Home.vue | 17 +-
site/src/main/.vuepress/components/Home_zh.vue | 17 +-
site/src/main/.vuepress/config.js | 4 +-
site/src/main/.vuepress/public/css/index.css | 21 +-
tsfile/pom.xml | 55 ++++++
.../metadata/ChunkGroupMetadata.java} | 29 ++-
.../tsfile/file/metadata/TimeseriesMetadata.java | 4 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 70 +++----
.../read/controller/CachedChunkLoaderImpl.java | 4 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 6 +-
.../read/controller/IChunkMetadataLoader.java | 2 +-
.../read/query/timegenerator/TimeGenerator.java | 36 +---
.../read/query/timegenerator/node/AndNode.java | 99 +++-------
.../read/query/timegenerator/node/LeafNode.java | 65 ++++---
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 119 +++++-------
.../iotdb/tsfile/read/reader/IChunkReader.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../read/reader/series/FileSeriesReader.java | 2 +-
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +-
.../write/writer/RestorableTsFileIOWriter.java | 47 +++--
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 90 +++++----
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 30 +--
.../tsfile/read/reader/FakedMultiBatchReader.java} | 41 +++-
.../tsfile/read/reader/FakedTimeGenerator.java | 73 +++++++
106 files changed, 2036 insertions(+), 1198 deletions(-)
[incubator-iotdb] 02/02: make site available only when use
-Pwebsite command
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch optimize_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ea4563b00c008278ef8b93d5f2f317ca21e7a44e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Apr 5 08:50:06 2020 +0800
make site available only when use -Pwebsite command
---
.travis.yml | 15 +-
Jenkinsfile | 2 +-
site/README.md | 2 +-
site/pom.xml | 691 +++++++++++++++++++++++++++++----------------------------
4 files changed, 358 insertions(+), 352 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b45bbe5..129ab83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,9 @@ matrix:
- mvn -version
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - travis_wait 40 mvn -B clean test integration-test -pl '!distribution','!site' -am
+ # we do not build site on Win
+ # we do not build distribution for save time
+ - travis_wait 40 mvn -B clean test integration-test -pl '!distribution' -am
# Killing background sleep loop
- kill %1
- os: linux
@@ -129,7 +131,7 @@ matrix:
token:
secure: "a2n2+MFfuOb3hsrw5vjiIUZzjt6S0j4YmRVrms6NVKF+EpEAWU/zOjzfccLGRr3VFUAlkoM2p578c/0DMMGew2oj3Yl1iJe2n35BWIV6r/psUKRUMdgMAogdshQzZGMYmY1XL2xA3ATu8cf4F8WoRAafd/S58JGQdTfsQ5svh31BxK0iuh+nMIZb4dYxO717dSVD45D9hoF5ROxdtTRbyAaXFPs5djxWrdzKw0J3e6a8m82K9FGcpy4pY9ct3ttbyEzGqMnzE4fhd3KgopFJj+3QdAi/3Cmkf1voxorQdCSbktl4PtlzMY/nxF6XETI2E4T+GLUVMw4iHiXCabqwOiudGnEj5DjNz6X5MVCOyj7lrFBTlDirGzv9fNpvQ2I47WOL8DzBJPqFwQ0nRAlbvcWVtE4aAqj8YF1QwwLxEIi4abDfOwaxGG2TOixQf627pvhh1o0RdEf9R6aRyur7vbM [...]
script:
- - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution','!site' -am
+ - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-iotdb -DskipTests -pl '!distribution' -am
- os: linux
if: fork = false #only fork=true (i.e., the committer has permission to write the repo)
name: code-coverage
@@ -137,15 +139,14 @@ matrix:
jdk: openjdk8
script:
# now, grafana has no tests; spark-* tests are written by scala
- - mvn post-integration-test -Pcode-coverage -pl '!distribution','!site' -am
- - mvn coveralls:report -Dservice_name=travis_ci -pl tsfile,jdbc,server,session,client,hadoop,hive-connector
-
+ - mvn post-integration-test -Pcode-coverage -pl '!distribution' -am
+ - mvn coveralls:report -Dservice_name=travis_ci -pl '!grafana','!spark-iotdb-connector','!spark-tsfile','!distribution','!site'
- os: linux
name: website checker
dist: xenial
jdk: openjdk8
script:
- - mvn clean package -pl site
+ - mvn clean package -pl site -Pwebsite
cache:
directories:
@@ -168,7 +169,7 @@ script:
- mvn -B apache-rat:check
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- - mvn -B clean test integration-test -pl '!site' -am
+ - mvn -B clean test integration-test
# Killing background sleep loop
- kill %1
diff --git a/Jenkinsfile b/Jenkinsfile
index d5ae674..291d926 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,7 +147,7 @@ pipeline {
}
steps {
// Publish the site with the scm-publish plugin.
- sh 'mvn package scm-publish:publish-scm -pl site'
+ sh 'mvn package scm-publish:publish-scm -pl site -Pwebsite'
// Clean up the snapshots directory (freeing up more space after deploying).
dir("target") {
diff --git a/site/README.md b/site/README.md
index 4e47d8b..da7d80b 100644
--- a/site/README.md
+++ b/site/README.md
@@ -27,7 +27,7 @@ See https://iotdb.apache.org/
## Build Setup
-run `mvn site -DskipTests` for:
+run `mvn package -DskipTests -Pwebsite` for:
- get docs from the master branch and all lagecy docs remotely.
- download node.js and npm;
diff --git a/site/pom.xml b/site/pom.xml
index 8f4a0c5..0ded820 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -37,353 +37,358 @@
<url>scm:git:https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git</url>
</site>
</distributionManagement>
- <build>
- <plugins>
- <!-- copy source codes into vue required folders-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-source-code-to-docs-folder</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>website</id>
+ <build>
+ <plugins>
+ <!-- copy source codes into vue required folders-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-source-code-to-docs-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>
+ </executions>
+ </plugin>
+ <!-- Copy master documents-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-master-docs-to-docs</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}/../docs</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-development</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-other-md-files-to-zh-development</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/Development</outputDirectory>
+ <!-- output directory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/../tsfile</directory>
+ <includes>
+ <include>format-changelist.md</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../service-rpc</directory>
+ <includes>
+ <include>rpc-changelist.md</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master into master folder -->
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>copy-package-json</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <fileSets>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/package.json</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
+ </fileSet>
+ <fileSet>
+ <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
+ </fileSet>
+ </fileSets>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-userguide-to-tmp-folder</id>
+ <phase>generate-sources</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>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-tmp-folder</id>
+ <phase>generate-sources</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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- download lagecy 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>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.9.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-0.8-docs</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
+ <outputDirectory>${project.build.directory}/download</outputDirectory>
+ <outputFileName>0.8.x.zip</outputFileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- unpack lagecy 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.9-documentation</id>
+ <goals>
+ <goal>copy</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>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.9-zh-documentation</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <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>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-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>
+ </fileset>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-0.8-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>
+ </fileset>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- mv UserGuide of master back -->
+ <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>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
+ <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mv-master-zh-userguide-to-docs</id>
+ <phase>generate-sources</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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--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>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/src/main/</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <installDirectory>${project.build.directory}/tools</installDirectory>
+ <workingDirectory>${project.build.directory}/vue-source</workingDirectory>
</configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Copy master documents-->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-master-docs-to-docs</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ <executions>
+ <execution>
+ <id>install-node-and-npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <nodeVersion>v11.5.0</nodeVersion>
+ <npmVersion>6.4.1</npmVersion>
+ </configuration>
+ </execution>
+ <!-- Install all project dependencies -->
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <!-- optional: default phase is "generate-resources" -->
+ <phase>package</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>package</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>
- <outputDirectory>${project.build.directory}/vue-source/src</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../docs</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <!-- 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>
- </execution>
- <execution>
- <id>copy-other-md-files-to-development</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
+ </plugin>
+ <plugin>
+ <groupId>org.simplify4u.plugins</groupId>
+ <artifactId>sitemapxml-maven-plugin</artifactId>
<configuration>
- <outputDirectory>${project.build.directory}/vue-source/src/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
+ <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
+ <maxDepth>5</maxDepth>
</configuration>
- </execution>
- <execution>
- <id>copy-other-md-files-to-zh-development</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/Development</outputDirectory>
- <!-- output directory -->
- <resources>
- <resource>
- <directory>${basedir}/../tsfile</directory>
- <includes>
- <include>format-changelist.md</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../service-rpc</directory>
- <includes>
- <include>rpc-changelist.md</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master into master folder -->
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>copy-package-json</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <fileSets>
- <fileSet>
- <sourceFile>${basedir}/src/main/package.json</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/package.json</destinationFile>
- </fileSet>
- <fileSet>
- <sourceFile>${basedir}/src/main/deploy.js</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/deploy.js</destinationFile>
- </fileSet>
- </fileSets>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-userguide-to-tmp-folder</id>
- <phase>generate-sources</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>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-tmp-folder</id>
- <phase>generate-sources</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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- download lagecy 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>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.9.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.9.x.zip</outputFileName>
- </configuration>
- </execution>
- <execution>
- <id>get-0.8-docs</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
- <url>https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip</url>
- <outputDirectory>${project.build.directory}/download</outputDirectory>
- <outputFileName>0.8.x.zip</outputFileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- unpack lagecy 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.9-documentation</id>
- <goals>
- <goal>copy</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>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.9-zh-documentation</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>generate-sources</phase>
- <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>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-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>
- </fileset>
- </configuration>
- </execution>
- <execution>
- <id>copy-0.8-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>
- </fileset>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- mv UserGuide of master back -->
- <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>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${project.build.directory}/vue-source/src/tmpUserGuide</sourceFile>
- <destinationFile>${project.build.directory}/vue-source/src/UserGuide</destinationFile>
- </configuration>
- </execution>
- <execution>
- <id>mv-master-zh-userguide-to-docs</id>
- <phase>generate-sources</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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--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>package</phase>
- <configuration>
- <nodeVersion>v11.5.0</nodeVersion>
- <npmVersion>6.4.1</npmVersion>
- </configuration>
- </execution>
- <!-- Install all project dependencies -->
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <!-- optional: default phase is "generate-resources" -->
- <phase>package</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>package</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>
- <configuration>
- <siteOutputDirectory>${project.build.directory}/vue-source/src/.vuepress/dist</siteOutputDirectory>
- <maxDepth>5</maxDepth>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>gen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>