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/10/02 02:51:06 UTC
[iotdb] 01/01: remove incubating or incubator word
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_readme
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1eb3cbe0c39a23dcfad95f9ef0fae2d299b724e1
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Fri Oct 2 10:50:27 2020 +0800
remove incubating or incubator word
---
.travis.yml | 4 ++--
README.md | 24 +++++++++++-----------
docs/Community/Community-Powered By.md | 2 +-
docs/SystemDesign/TsFile/Format.md | 8 ++++----
docs/UserGuide/Client/Programming - TsFile API.md | 4 ++--
docs/UserGuide/Ecosystem Integration/Grafana.md | 8 ++++----
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 8 ++++----
.../Ecosystem Integration/MapReduce TsFile.md | 6 +++---
.../Ecosystem Integration/Spark TsFile.md | 6 +++---
.../Get Started/Frequently asked questions.md | 8 ++++----
docs/UserGuide/Get Started/QuickStart.md | 4 ++--
docs/UserGuide/Server/Docker Image.md | 8 ++++----
docs/UserGuide/Server/Download.md | 10 ++++-----
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
docs/zh/UserGuide/Client/Command Line Interface.md | 2 +-
.../UserGuide/Client/Programming - TsFile API.md | 4 ++--
docs/zh/UserGuide/Ecosystem Integration/Grafana.md | 8 ++++----
.../UserGuide/Ecosystem Integration/Hive TsFile.md | 12 +++++------
.../Ecosystem Integration/MapReduce TsFile.md | 6 +++---
.../Ecosystem Integration/Spark TsFile.md | 6 +++---
.../Get Started/Frequently asked questions.md | 10 ++++-----
docs/zh/UserGuide/Get Started/QuickStart.md | 4 ++--
docs/zh/UserGuide/Server/Docker Image.md | 10 ++++-----
docs/zh/UserGuide/Server/Download.md | 2 +-
pom.xml | 10 ++++-----
25 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ea1fdc5..61e5881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,11 +113,11 @@ matrix:
addons:
sonarcloud:
organization: "apache"
- projectKey: "apache_incubator-iotdb"
+ projectKey: "apache_iotdb"
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' -am
+ - mvn verify sonar:sonar -Dsonar.organization=apache -Dsonar.projectKey=apache_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
diff --git a/README.md b/README.md
index 527ad27..0ad6c00 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,17 @@
[English](./README.md) | [中文](./README_ZH.md)
# IoTDB
-[](https://www.travis-ci.org/apache/incubator-iotdb)
-[](https://coveralls.io/repos/github/apache/incubator-iotdb/badge.svg?branch=master)
-[](https://github.com/apache/incubator-iotdb/releases)
+[](https://www.travis-ci.org/apache/iotdb)
+[](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)
+[](https://github.com/apache/iotdb/releases)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
-
-
+
+
[](https://iotdb.apache.org/)
[](http://search.maven.org/#search|gav|1|g:"org.apache.iotdb")
-[](https://gitpod.io/#https://github.com/apache/incubator-iotdb)
+[](https://gitpod.io/#https://github.com/apache/iotdb)
# Overview
@@ -101,7 +101,7 @@ IoTDB provides three installation methods, you can refer to the following sugges
* Installation from source code. If you need to modify the code yourself, you can use this method.
* Installation from binary files. Download the binary files from the official website. This is the recommended method, in which you will get a binary released package which is out-of-the-box.(Comming Soon...)
-* Using Docker：The path to the dockerfile is https://github.com/apache/incubator-iotdb/tree/master/docker/src/main
+* Using Docker：The path to the dockerfile is https://github.com/apache/iotdb/tree/master/docker/src/main
Here in the Quick Start, we give a brief introduction of using source code to install IoTDB. For further information, please refer to Chapter 3 of the User Guide.
@@ -111,7 +111,7 @@ Here in the Quick Start, we give a brief introduction of using source code to in
You can download the source code from:
```
-git clone https://github.com/apache/incubator-iotdb.git
+git clone https://github.com/apache/iotdb.git
```
The default master branch is the dev branch, If you want to use a released version x.x.x:
@@ -121,13 +121,13 @@ git checkout release/x.x.x
```
-Under the root path of incubator-iotdb:
+Under the root path of iotdb:
```
> mvn clean package -DskipTests
```
-Then the binary version (including both server and cli) can be found at **distribution/target/apache-iotdb-{project.version}-incubating-bin.zip**
+Then the binary version (including both server and cli) can be found at **distribution/target/apache-iotdb-{project.version}-bin.zip**
> NOTE: Directories "thrift/target/generated-sources/thrift" and "antlr/target/generated-sources/antlr4" need to be added to sources roots to avoid compilation errors in the IDE.
@@ -313,7 +313,7 @@ The server can be stopped with "ctrl-C" or the following script:
## Only build server
-Under the root path of incubator-iotdb:
+Under the root path of iotdb:
```
> mvn clean package -pl server -am -DskipTests
@@ -324,7 +324,7 @@ After being built, the IoTDB server is located at the folder: "server/target/iot
## Only build cli
-Under the root path of incubator-iotdb:
+Under the root path of iotdb:
```
> mvn clean package -pl cli -am -DskipTests
diff --git a/docs/Community/Community-Powered By.md b/docs/Community/Community-Powered By.md
index 71e55df..607d094 100644
--- a/docs/Community/Community-Powered By.md
+++ b/docs/Community/Community-Powered By.md
@@ -31,7 +31,7 @@ A common practice you can take is to create software identifiers (Maven coordina
### Companies and Organizations
To add yourself to the list, please email dev@iotdb.apache.org with your organization name, URL, a list of IoTDB components you are using, and a short description of your use case.
-You can also leave the info on [Github](https://github.com/apache/incubator-iotdb/issues/748).
+You can also leave the info on [Github](https://github.com/apache/iotdb/issues/748).
- School of Software (Tsinghua University), and National Engineering Laboratery for Big Data Software that initially launched IoTDB
- We have both graduate students and a team of professional software engineers working on the stack
diff --git a/docs/SystemDesign/TsFile/Format.md b/docs/SystemDesign/TsFile/Format.md
index 6fb50c6..e72401e 100644
--- a/docs/SystemDesign/TsFile/Format.md
+++ b/docs/SystemDesign/TsFile/Format.md
@@ -248,7 +248,7 @@ For Linux or MacOs:
An example on Windows:
```
-D:\incubator-iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
+D:\iotdb\server\target\iotdb-server-0.11.0-SNAPSHOT\tools\tsfileToolSet>.\print-iotdb-data-dir.bat D:\\data\data
````````````````````````
Starting Printing the IoTDB Data Directory Overview
````````````````````````
@@ -299,7 +299,7 @@ For Linux or MacOs:
An example on Windows:
```
-D:\incubator-iotdb\server\target\iotdb-server-0.10.0\tools\tsfileToolSet>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle
+D:\iotdb\server\target\iotdb-server-0.10.0\tools\tsfileToolSet>.\print-tsfile-resource-files.bat D:\data\data\sequence\root.vehicle
````````````````````````
Starting Printing the TsFileResources
````````````````````````
@@ -333,8 +333,8 @@ For Linux or MacOs:
An example on macOS:
-```$xslt
-/incubator-iotdb/server/target/iotdb-server-0.10.0/tools/tsfileToolSet$ ./print-tsfile-sketch.sh test.tsfile
+```console
+/iotdb/server/target/iotdb-server-0.10.0/tools/tsfileToolSet$ ./print-tsfile-sketch.sh test.tsfile
````````````````````````
Starting Printing the TsFile Sketch
````````````````````````
diff --git a/docs/UserGuide/Client/Programming - TsFile API.md b/docs/UserGuide/Client/Programming - TsFile API.md
index 5571d17..17b7209 100644
--- a/docs/UserGuide/Client/Programming - TsFile API.md
+++ b/docs/UserGuide/Client/Programming - TsFile API.md
@@ -31,7 +31,7 @@ There are two ways to use TsFile in your own project.
* Compile the source codes and build to jars
```
- git clone https://github.com/apache/incubator-iotdb.git
+ git clone https://github.com/apache/iotdb.git
cd tsfile/
mvn clean package -Dmaven.test.skip=true
```
@@ -44,7 +44,7 @@ There are two ways to use TsFile in your own project.
* Get the source codes
```
- git clone https://github.com/apache/incubator-iotdb.git
+ git clone https://github.com/apache/iotdb.git
```
* Compile the source codes and deploy
diff --git a/docs/UserGuide/Ecosystem Integration/Grafana.md b/docs/UserGuide/Ecosystem Integration/Grafana.md
index b121a62..e6885ca 100644
--- a/docs/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/UserGuide/Ecosystem Integration/Grafana.md
@@ -74,26 +74,26 @@ If you use Windows, start Grafana by executing grafana-server.exe, located in th
## IoTDB installation
-See https://github.com/apache/incubator-iotdb
+See https://github.com/apache/iotdb
## IoTDB-Grafana installation
```shell
-git clone https://github.com/apache/incubator-iotdb.git
+git clone https://github.com/apache/iotdb.git
```
### Start IoTDB-Grafana
#### Option one
-Import the entire project, after the maven dependency is installed, directly run`incubatoriotdb/grafana/rc/main/java/org/apache/iotdb/web/grafana`directory` TsfileWebDemoApplication.java`, this grafana connector is developed by springboot
+Import the entire project, after the maven dependency is installed, directly run`iotdb/grafana/rc/main/java/org/apache/iotdb/web/grafana`directory` TsfileWebDemoApplication.java`, this grafana connector is developed by springboot
#### Option two
In `/grafana/target/`directory
```shell
-cd incubator-iotdb
+cd iotdb
mvn clean package -pl grafana -am -Dmaven.test.skip=true
cd grafana/target
java -jar iotdb-grafana-{version}.war
diff --git a/docs/UserGuide/Ecosystem Integration/Hive TsFile.md b/docs/UserGuide/Ecosystem Integration/Hive TsFile.md
index d6b14fc..1fac80c 100644
--- a/docs/UserGuide/Ecosystem Integration/Hive TsFile.md
+++ b/docs/UserGuide/Ecosystem Integration/Hive TsFile.md
@@ -52,7 +52,7 @@ With this connector, you can
|------------- |------------ | ------------ |------------ |
| `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.10.0`|
-> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
+> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/iotdb/tree/master/tsfile.
## Data Type Correspondence
@@ -75,10 +75,10 @@ After downloading the code of iotdb from <https://github.com/apache/incubator-io
Then in hive, use the command of `add jar XXX` to add the dependency. For example:
```
-hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar;
+hive> add jar /Users/hive/iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar;
-Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar] to class path
-Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar]
+Added [/Users/hive/iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar] to class path
+Added resources: [/Users/hive/iotdb/hive-connector/target/hive-connector-0.10.0-jar-with-dependencies.jar]
```
diff --git a/docs/UserGuide/Ecosystem Integration/MapReduce TsFile.md b/docs/UserGuide/Ecosystem Integration/MapReduce TsFile.md
index 4d825be..87045d1 100644
--- a/docs/UserGuide/Ecosystem Integration/MapReduce TsFile.md
+++ b/docs/UserGuide/Ecosystem Integration/MapReduce TsFile.md
@@ -49,7 +49,7 @@ With this connector, you can
|------------- | ------------ |------------ |
| `2.7.3` | `1.8` | `0.10.0`|
-> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
+> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/iotdb/tree/master/tsfile.
## Data Type Correspondence
@@ -149,7 +149,7 @@ Then, the `mapper` and `reducer` class is how you deal with the `MapWritable` pr
}
```
-> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSFMRReadExample.java
+> Note: For the complete code, please see the following link: https://github.com/apache/iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSFMRReadExample.java
### Write Example: write the average into Tsfile
@@ -209,4 +209,4 @@ Then, the `mapper` and `reducer` class is how you deal with the `MapWritable` pr
}
}
```
-> Note: For the complete code, please see the following link: https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSMRWriteExample.java
\ No newline at end of file
+> Note: For the complete code, please see the following link: https://github.com/apache/iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb//hadoop/tsfile/TSMRWriteExample.java
\ No newline at end of file
diff --git a/docs/UserGuide/Ecosystem Integration/Spark TsFile.md b/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
index ca928f0..7c34579 100644
--- a/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
+++ b/docs/UserGuide/Ecosystem Integration/Spark TsFile.md
@@ -36,7 +36,7 @@ With this connector, you can
|------------- | ------------- | ------------ |------------ |
| `2.4.3` | `2.11.8` | `1.8` | `0.10.0`|
-> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
+> Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/iotdb/tree/master/tsfile.
## 3. Quick Start
### Local Mode
@@ -51,7 +51,7 @@ Note:
* \<spark-shell-path\> is the real path of your spark-shell.
* Multiple jar packages are separated by commas without any spaces.
-* See https://github.com/apache/incubator-iotdb/tree/master/tsfile for how to get TsFile.
+* See https://github.com/apache/iotdb/tree/master/tsfile for how to get TsFile.
### Distributed Mode
@@ -66,7 +66,7 @@ Note:
* \<spark-shell-path\> is the real path of your spark-shell.
* Multiple jar packages are separated by commas without any spaces.
-* See https://github.com/apache/incubator-iotdb/tree/master/tsfile for how to get TsFile.
+* See https://github.com/apache/iotdb/tree/master/tsfile for how to get TsFile.
## 4. Data Type Correspondence
diff --git a/docs/UserGuide/Get Started/Frequently asked questions.md b/docs/UserGuide/Get Started/Frequently asked questions.md
index 172c318..cded543 100644
--- a/docs/UserGuide/Get Started/Frequently asked questions.md
+++ b/docs/UserGuide/Get Started/Frequently asked questions.md
@@ -84,7 +84,7 @@ Suppose your root directory is:
```
$ pwd
-/workspace/incubator-iotdb
+/workspace/iotdb
$ ls -l
server/
@@ -94,9 +94,9 @@ Readme.md
...
```
-Let `$IOTDB_HOME = /workspace/incubator-iotdb/server/target/iotdb-server-{project.version}`
+Let `$IOTDB_HOME = /workspace/iotdb/server/target/iotdb-server-{project.version}`
-Let `$IOTDB_CLI_HOME = /workspace/incubator-iotdb/cli/target/iotdb-cli-{project.version}`
+Let `$IOTDB_CLI_HOME = /workspace/iotdb/cli/target/iotdb-cli-{project.version}`
By default settings, the logs are stored under ```IOTDB_HOME/logs```. You can change log level and storage path by configuring ```logback.xml``` under ```IOTDB_HOME/conf```.
@@ -129,7 +129,7 @@ If you are using Linux, you can use the following shell command:
## Can I use Hadoop and Spark to read TsFile in IoTDB?
-Yes. IoTDB has intense integration with Open Source Ecosystem. IoTDB supports [Hadoop](https://github.com/apache/incubator-iotdb/tree/master/hadoop), [Spark](https://github.com/apache/incubator-iotdb/tree/master/spark) and [Grafana](https://github.com/apache/incubator-iotdb/tree/master/grafana) visualization tool.
+Yes. IoTDB has intense integration with Open Source Ecosystem. IoTDB supports [Hadoop](https://github.com/apache/iotdb/tree/master/hadoop), [Spark](https://github.com/apache/iotdb/tree/master/spark) and [Grafana](https://github.com/apache/iotdb/tree/master/grafana) visualization tool.
## How does IoTDB handle duplicate points?
diff --git a/docs/UserGuide/Get Started/QuickStart.md b/docs/UserGuide/Get Started/QuickStart.md
index 4b140ec..8b3c626 100644
--- a/docs/UserGuide/Get Started/QuickStart.md
+++ b/docs/UserGuide/Get Started/QuickStart.md
@@ -54,7 +54,7 @@ IoTDB provides you three installation methods, you can refer to the following su
* Installation from source code. If you need to modify the code yourself, you can use this method.
* Installation from binary files. Download the binary files from the official website. This is the recommended method, in which you will get a binary released package which is out-of-the-box.(Coming Soon...)
-* Using Docker：The path to the dockerfile is https://github.com/apache/incubator-iotdb/blob/master/docker/src/main
+* Using Docker：The path to the dockerfile is https://github.com/apache/iotdb/blob/master/docker/src/main
Here in the Quick Start, we give a brief introduction to install IoTDB. For further information, please refer to Chapter 3 of the User Guide.
@@ -254,7 +254,7 @@ The server can be stopped with ctrl-C or the following script:
## Only build cli
-Under the root path of incubator-iotdb:
+Under the root path of iotdb:
```
> mvn clean package -pl cli -am -DskipTests
diff --git a/docs/UserGuide/Server/Docker Image.md b/docs/UserGuide/Server/Docker Image.md
index f9e1928..1e86dc8 100644
--- a/docs/UserGuide/Server/Docker Image.md
+++ b/docs/UserGuide/Server/Docker Image.md
@@ -25,12 +25,12 @@ Now a Dockerfile has been written at docker/src/main/Dockerfile.
1. You can build a docker image by:
```
-$ docker build -t iotdb:base git://github.com/apache/incubator-iotdb#master:docker
+$ docker build -t iotdb:base git://github.com/apache/iotdb#master:docker
```
Or:
```
-$ git clone https://github.com/apache/incubator-iotdb
-$ cd incubator-iotdb
+$ git clone https://github.com/apache/iotdb
+$ cd iotdb
$ cd docker
$ docker build -t iotdb:base .
```
@@ -84,6 +84,6 @@ $ start-cli.sh -h localhost -p 6667 -u root -pw root
<version>0.10.0</version>
</dependency>
```
-Some examples about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
+Some examples about how to use IoTDB with IoTDB-JDBC can be found at: https://github.com/apache/iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
6. Now enjoy it!
diff --git a/docs/UserGuide/Server/Download.md b/docs/UserGuide/Server/Download.md
index a5d4f12..8a6fe4b 100644
--- a/docs/UserGuide/Server/Download.md
+++ b/docs/UserGuide/Server/Download.md
@@ -25,7 +25,7 @@ IoTDB provides you three installation methods, you can refer to the following su
* Installation from source code. If you need to modify the code yourself, you can use this method.
* Installation from binary files. Download the binary files from the official website. This is the recommended method, in which you will get a binary released package which is out-of-the-box.(Comming Soon...)
-* Using Docker：The path to the dockerfile is https://github.com/apache/incubator-iotdb/blob/master/docker/Dockerfile
+* Using Docker：The path to the dockerfile is https://github.com/apache/iotdb/blob/master/docker/Dockerfile
## Prerequisites
@@ -44,14 +44,14 @@ You can download the binary file from:
## Installation from source code
-You can get the released source code from https://iotdb.apache.org/Download/, or from the git repository https://github.com/apache/incubator-iotdb/tree/master
+You can get the released source code from https://iotdb.apache.org/Download/, or from the git repository https://github.com/apache/iotdb/tree/master
You can download the source code from:
```
-git clone https://github.com/apache/incubator-iotdb.git
+git clone https://github.com/apache/iotdb.git
```
-Under the root path of incubator-iotdb:
+Under the root path of iotdb:
```
> mvn clean package -DskipTests
@@ -61,7 +61,7 @@ Then the binary version (including both server and client) can be found at **dis
> NOTE: Directories "thrift/target/generated-sources/thrift" and "antlr/target/generated-sources/antlr4" need to be added to sources roots to avoid compilation errors in IDE.
-If you would like to build the IoTDB server, you can run the following command under the root path of incubator-iotdb:
+If you would like to build the IoTDB server, you can run the following command under the root path of iotdb:
```
> mvn clean package -pl server -am -DskipTests
diff --git a/docs/zh/SystemDesign/TsFile/Format.md b/docs/zh/SystemDesign/TsFile/Format.md
index cb5f065..9320b3b 100644
--- a/docs/zh/SystemDesign/TsFile/Format.md
+++ b/docs/zh/SystemDesign/TsFile/Format.md
@@ -331,7 +331,7 @@ Linux or MacOs:
在mac系统中的示例:
-```$xslt
+```console
/incubator-iotdb/server/target/iotdb-server-0.10.0/tools/tsfileToolSet$ ./print-tsfile-sketch.sh test.tsfile
````````````````````````
Starting Printing the TsFile Sketch
diff --git a/docs/zh/UserGuide/Client/Command Line Interface.md b/docs/zh/UserGuide/Client/Command Line Interface.md
index abebcba..67c6792 100644
--- a/docs/zh/UserGuide/Client/Command Line Interface.md
+++ b/docs/zh/UserGuide/Client/Command Line Interface.md
@@ -37,7 +37,7 @@ IOTDB为用户提供cli/Shell工具用于启动客户端和服务端程序。下
> \$IOTDB\_HOME表示IoTDB的安装目录所在路径。
## Cli / Shell安装
-在incubator-iotdb的根目录下执行
+在iotdb的根目录下执行
```
> mvn clean package -pl cli -am -DskipTests
diff --git a/docs/zh/UserGuide/Client/Programming - TsFile API.md b/docs/zh/UserGuide/Client/Programming - TsFile API.md
index 78b7deb..1a002f2 100644
--- a/docs/zh/UserGuide/Client/Programming - TsFile API.md
+++ b/docs/zh/UserGuide/Client/Programming - TsFile API.md
@@ -32,7 +32,7 @@ TsFile 是在 IoTDB 中使用的时间序列的文件格式。在这个章节中
* 编译源码生成 jar 包
```
- git clone https://github.com/apache/incubator-iotdb.git
+ git clone https://github.com/apache/iotdb.git
cd tsfile/
mvn clean package -Dmaven.test.skip=true
```
@@ -45,7 +45,7 @@ TsFile 是在 IoTDB 中使用的时间序列的文件格式。在这个章节中
* 下载源码
```
- git clone https://github.com/apache/incubator-iotdb.git
+ git clone https://github.com/apache/iotdb.git
```
* 编译源码和部署到本地仓库
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
index c0bd31f..8e4e85b 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Grafana.md
@@ -77,24 +77,24 @@ Shell > grafana-server --config=/usr/local/etc/grafana/grafana.ini --homepath /u
## IoTDB安装
-参见[https://github.com/apache/incubator-iotdb](https://github.com/apache/incubator-iotdb)
+参见[https://github.com/apache/iotdb](https://github.com/apache/iotdb)
## IoTDB-Grafana连接器安装
```shell
-git clone https://github.com/apache/incubator-iotdb.git
+git clone https://github.com/apache/iotdb.git
```
### 启动IoTDB-Grafana
#### 方案一（适合开发者）
-导入整个项目，maven依赖安装完后，直接运行`incubatoriotdb/grafana/rc/main/java/org/apache/iotdb/web/grafana`目录下`TsfileWebDemoApplication.java`，这个grafana连接器采用springboot开发
+导入整个项目，maven依赖安装完后，直接运行`iotdb/grafana/rc/main/java/org/apache/iotdb/web/grafana`目录下`TsfileWebDemoApplication.java`，这个grafana连接器采用springboot开发
#### 方案二（适合使用者）
```shell
-cd incubator-iotdb
+cd iotdb
mvn clean package -pl grafana -am -Dmaven.test.skip=true
cd grafana/target
java -jar iotdb-grafana-{version}.war
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md b/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
index fa35f1f..cc0bf2c 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Hive TsFile.md
@@ -51,7 +51,7 @@ TsFile的Hive连接器实现了对Hive读取外部Tsfile类型的文件格式的
|------------- |------------ | ------------ |------------ |
| `2.7.3` or `3.2.1` | `2.3.6` or `3.1.2` | `1.8` | `0.10.0`|
-> 注意：关于如何下载和使用Tsfile, 请参考以下链接: <https://github.com/apache/incubator-iotdb/tree/master/tsfile>。
+> 注意：关于如何下载和使用Tsfile, 请参考以下链接: <https://github.com/apache/iotdb/tree/master/tsfile>。
## 数据类型对应关系
@@ -69,15 +69,15 @@ TsFile的Hive连接器实现了对Hive读取外部Tsfile类型的文件格式的
为了在Hive中使用Tsfile的hive连接器，我们需要把hive连接器的jar导入进hive。
-从 <https://github.com/apache/incubator-iotdb>下载完iotdb后, 你可以使用 `mvn clean package -pl hive-connector -am -Dmaven.test.skip=true`命令得到一个 `hive-connector-X.X.X-SNAPSHOT-jar-with-dependencies.jar`。
+从 <https://github.com/apache/iotdb>下载完iotdb后, 你可以使用 `mvn clean package -pl hive-connector -am -Dmaven.test.skip=true`命令得到一个 `hive-connector-X.X.X-SNAPSHOT-jar-with-dependencies.jar`。
然后在hive的命令行中，使用`add jar XXX`命令添加依赖。例如:
-```
-hive> add jar /Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar;
+```console
+hive> add jar /Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar;
-Added [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar] to class path
-Added resources: [/Users/hive/incubator-iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar]
+Added [/Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar] to class path
+Added resources: [/Users/hive/iotdb/hive-connector/target/hive-connector-0.11.0-SNAPSHOT-jar-with-dependencies.jar]
```
diff --git a/docs/zh/UserGuide/Ecosystem Integration/MapReduce TsFile.md b/docs/zh/UserGuide/Ecosystem Integration/MapReduce TsFile.md
index 916552f..1a5b094 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/MapReduce TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/MapReduce TsFile.md
@@ -51,7 +51,7 @@ TsFile的Hadoop连接器实现了对Hadoop读取外部Tsfile类型的文件格
|------------- | ------------ |------------ |
| `2.7.3` | `1.8` | `0.10.0`|
->注意：关于如何下载和使用Tsfile, 请参考以下链接: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
+>注意：关于如何下载和使用Tsfile, 请参考以下链接: https://github.com/apache/iotdb/tree/master/tsfile.
## 数据类型对应关系
@@ -154,7 +154,7 @@ TSFInputFormat将tsfile中的数据以多个`MapWritable`记录的形式返回
}
```
-> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java
+> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSFMRReadExample.java
### 写示例: 计算平均数并写入Tsfile中
@@ -215,4 +215,4 @@ TSFInputFormat将tsfile中的数据以多个`MapWritable`记录的形式返回
}
}
```
-> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/incubator-iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
\ No newline at end of file
+> 注意: 完整的代码示例可以在如下链接中找到：https://github.com/apache/iotdb/blob/master/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
\ No newline at end of file
diff --git a/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md b/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
index e34e4e3..04398e5 100644
--- a/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
+++ b/docs/zh/UserGuide/Ecosystem Integration/Spark TsFile.md
@@ -37,7 +37,7 @@ TsFile-Spark-Connector对Tsfile类型的外部数据源实现Spark的支持。
| ------------- | ------------- | ------------ | -------- |
| `2.4.3` | `2.11.8` | `1.8` | `0.10.0` |
-> 注意：有关如何下载和使用TsFile的更多信息，请参见以下链接：https://github.com/apache/incubator-iotdb/tree/master/tsfile
+> 注意：有关如何下载和使用TsFile的更多信息，请参见以下链接：https://github.com/apache/iotdb/tree/master/tsfile
## 3. 快速开始
@@ -51,7 +51,7 @@ TsFile-Spark-Connector对Tsfile类型的外部数据源实现Spark的支持。
- \<spark-shell-path\>是您的spark-shell的真实路径。
- 多个jar包用逗号分隔，没有任何空格。
-- 有关如何获取TsFile的信息，请参见https://github.com/apache/incubator-iotdb/tree/master/tsfile。
+- 有关如何获取TsFile的信息，请参见https://github.com/apache/iotdb/tree/master/tsfile。
### 分布式模式
@@ -65,7 +65,7 @@ TsFile-Spark-Connector对Tsfile类型的外部数据源实现Spark的支持。
- \<spark-shell-path\>是您的spark-shell的真实路径。
- 多个jar包用逗号分隔，没有任何空格。
-- 有关如何获取TsFile的信息，请参见https://github.com/apache/incubator-iotdb/tree/master/tsfile。
+- 有关如何获取TsFile的信息，请参见https://github.com/apache/iotdb/tree/master/tsfile。
## 4. 数据类型对应
diff --git a/docs/zh/UserGuide/Get Started/Frequently asked questions.md b/docs/zh/UserGuide/Get Started/Frequently asked questions.md
index 9653ca9..f6a12ac 100644
--- a/docs/zh/UserGuide/Get Started/Frequently asked questions.md
+++ b/docs/zh/UserGuide/Get Started/Frequently asked questions.md
@@ -83,9 +83,9 @@ It costs 0.241s
假设您的根目录是:
-```
+```shell
$ pwd
-/workspace/incubator-iotdb
+/workspace/iotdb
$ ls -l
server/
@@ -95,9 +95,9 @@ Readme.md
...
```
-假如 `$IOTDB_HOME = /workspace/incubator-iotdb/server/target/iotdb-server-{project.version}`
+假如 `$IOTDB_HOME = /workspace/iotdb/server/target/iotdb-server-{project.version}`
-假如 `$IOTDB_CLI_HOME = /workspace/incubator-iotdb/cli/target/iotdb-cli-{project.version}`
+假如 `$IOTDB_CLI_HOME = /workspace/iotdb/cli/target/iotdb-cli-{project.version}`
在默认的设置里，logs 文件夹会被存储在```IOTDB_HOME/logs```。您可以在```IOTDB_HOME/conf```目录下的```logback.xml```文件中修改日志的级别和日志的存储路径。
@@ -130,7 +130,7 @@ IoTDB> count timeseries root
## 可以使用 Hadoop 和 Spark 读取 IoTDB 中的 TsFile 吗？
-是的。IoTDB 与开源生态紧密结合。IoTDB 支持 [Hadoop](https://github.com/apache/incubator-iotdb/tree/master/hadoop), [Spark](https://github.com/apache/incubator-iotdb/tree/master/spark) 和 [Grafana](https://github.com/apache/incubator-iotdb/tree/master/grafana) 可视化工具.
+是的。IoTDB 与开源生态紧密结合。IoTDB 支持 [Hadoop](https://github.com/apache/iotdb/tree/master/hadoop), [Spark](https://github.com/apache/incubator-iotdb/tree/master/spark) 和 [Grafana](https://github.com/apache/incubator-iotdb/tree/master/grafana) 可视化工具.
## IoTDB如何处理重复的数据点？
diff --git a/docs/zh/UserGuide/Get Started/QuickStart.md b/docs/zh/UserGuide/Get Started/QuickStart.md
index 54f3ee1..3ce1f47 100644
--- a/docs/zh/UserGuide/Get Started/QuickStart.md
+++ b/docs/zh/UserGuide/Get Started/QuickStart.md
@@ -57,7 +57,7 @@ IoTDB支持多种安装途径。用户可以使用三种方式对IoTDB进行安
* 二进制可运行程序：请从Download页面下载最新的安装包，解压后即完成安装。
-* 使用Docker镜像：dockerfile 文件位于 https://github.com/apache/incubator-iotdb/blob/master/docker/src/main
+* 使用Docker镜像：dockerfile 文件位于 https://github.com/apache/iotdb/blob/master/docker/src/main
### IoTDB下载
@@ -290,7 +290,7 @@ Windows系统停止命令如下：
## 只建立客户端
-在incubator-iotdb的根路径下：
+在iotdb的根路径下：
```
> mvn clean package -pl cli -am -DskipTests
diff --git a/docs/zh/UserGuide/Server/Docker Image.md b/docs/zh/UserGuide/Server/Docker Image.md
index 81e3f86..0b673eb 100644
--- a/docs/zh/UserGuide/Server/Docker Image.md
+++ b/docs/zh/UserGuide/Server/Docker Image.md
@@ -25,12 +25,12 @@ Dockerfile 存放在的 docker 工程下的 src/main/Dockerfile 中.
1. 您可以使用下面的命令构建 docker image:
```
-$ docker build -t iotdb:base git://github.com/apache/incubator-iotdb#master:docker
+$ docker build -t iotdb:base git://github.com/apache/iotdb#master:docker
```
或者:
-```
-$ git clone https://github.com/apache/incubator-iotdb
-$ cd incubator-iotdb
+```console
+$ git clone https://github.com/apache/iotdb
+$ cd iotdb
$ cd docker
$ docker build -t iotdb:base .
```
@@ -84,6 +84,6 @@ $ start-cli.sh -h localhost -p 6667 -u root -pw root
<version>0.10.0</version>
</dependency>
```
-这里是一些使用 IoTDB-JDBC 连接 IoTDB 的示例: https://github.com/apache/incubator-iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
+这里是一些使用 IoTDB-JDBC 连接 IoTDB 的示例: https://github.com/apache/iotdb/tree/master/example/jdbc/src/main/java/org/apache/iotdb
6. 现在已经大功告成了
diff --git a/docs/zh/UserGuide/Server/Download.md b/docs/zh/UserGuide/Server/Download.md
index 4ba4eec..eb72aa3 100644
--- a/docs/zh/UserGuide/Server/Download.md
+++ b/docs/zh/UserGuide/Server/Download.md
@@ -63,7 +63,7 @@ Shell > tar -zxf iotdb-<version>.tar.gz # For Linux or MacOS
## 使用源码编译
-您可以获取已发布的源码https://iotdb.apache.org/Download/，或者从git仓库获取https://github.com/apache/incubator-iotdb/tree/master
+您可以获取已发布的源码https://iotdb.apache.org/Download/，或者从git仓库获取https://github.com/apache/iotdb/tree/master
源码克隆后，进入到源码文件夹目录下，使用以下命令进行编译：
diff --git a/pom.xml b/pom.xml
index 2d46d1c..95d19df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,16 @@
</license>
</licenses>
<scm>
- <connection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</developerConnection>
- <url>ssh://git@github.com:apache/incubator-iotdb.git</url>
+ <connection>scm:git:ssh://git@github.com/apache/iotdb.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/apache/iotdb.git</developerConnection>
+ <url>ssh://git@github.com:apache/iotdb.git</url>
<tag>rel/0.10</tag>
</scm>
<!-- Only configure the site distribution as the rest is handled by the apache parent -->
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:git:https://gitbox.apache.org/repos/asf/incubator-iotdb-website.git</url>
+ <url>scm:git:https://gitbox.apache.org/repos/asf/iotdb-website.git</url>
</site>
</distributionManagement>
<issueManagement>
@@ -1243,7 +1243,7 @@
</build>
</profile>
<!-- upload code coverage report to coveralls.io-->
- <!-- to enable coveralls locally, you need to get the repoToken from https://coveralls.io/github/apache/incubator-iotdb.
+ <!-- to enable coveralls locally, you need to get the repoToken from https://coveralls.io/github/apache/iotdb.
use `mvn post-integration-test -Pcode-coverage -DrepoToken=TOKEN`-->
<!-- enable site-->
<!-- use `mvn package -P site -pl site` to compile the site module only -->