This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new f2c1b5a7f53 compliation fix
f2c1b5a7f53 is described below
commit f2c1b5a7f53fb7648c8c93c141d027e269756876
Author: jiafeng.zhang <[email protected]>
AuthorDate: Wed Jul 27 09:39:36 2022 +0800
compliation fix
compliation fix
---
docs/install/source-install/compilation-arm.md | 8 +-
.../compilation-with-ldb-toolchain.md | 4 +-
docs/install/source-install/compilation.md | 319 ++++++++++-----------
.../install/source-install/compilation-arm.md | 10 +-
.../compilation-with-ldb-toolchain.md | 4 +-
.../current/install/source-install/compilation.md | 143 +++++----
6 files changed, 243 insertions(+), 245 deletions(-)
diff --git a/docs/install/source-install/compilation-arm.md
b/docs/install/source-install/compilation-arm.md
index afeac005218..6afade20bd3 100644
--- a/docs/install/source-install/compilation-arm.md
+++ b/docs/install/source-install/compilation-arm.md
@@ -55,7 +55,7 @@ Note that this document is for guidance only. Compiling in
different environment
### Compile with ldb-toolchain
-This method works for Doris versions after [commit
7f3564](https://github.com/apache/incubator-doris/commit/7f3564cca62de49c9f2ea67fcf735921dbebb4d1).
+This method works for Doris versions after [commit
7f3564](https://github.com/apache/doris/commit/7f3564cca62de49c9f2ea67fcf735921dbebb4d1).
Download
[ldb\_toolchain\_gen.aarch64.sh](https://github.com/amosbird/ldb_toolchain_gen/releases/download/v0.9.1/ldb_toolchain_gen.aarch64.sh)
@@ -333,7 +333,7 @@ Note that both jdk and nodejs need to download the
corresponding aarch64 version
```shell
cd /opt
-git clone https://github.com/apache/incubator-doris.git
+git clone https://github.com/apache/doris.git
```
#### Install and deploy
@@ -375,7 +375,7 @@ USE_AVX2=OFF sh build.sh
```shell
export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
- sh /opt/incubator-doris/thirdparty/build-thirdparty.sh
+ sh /opt/doris/thirdparty/build-thirdparty.sh
````
REPOSITORY_URL contains all third-party library source packages and
their historical versions.
@@ -386,7 +386,7 @@ USE_AVX2=OFF sh build.sh
- An exception is thrown when executing build.sh
- > /opt/incubator-doris/env.sh: line 46: python: command not found
+ > /opt/doris/env.sh: line 46: python: command not found
>
> Python 2.7.18
diff --git a/docs/install/source-install/compilation-with-ldb-toolchain.md
b/docs/install/source-install/compilation-with-ldb-toolchain.md
index f16c1d72af5..d164a42e053 100644
--- a/docs/install/source-install/compilation-with-ldb-toolchain.md
+++ b/docs/install/source-install/compilation-with-ldb-toolchain.md
@@ -28,7 +28,7 @@ under the License.
This document describes how to compile Doris using the LDB toolchain. This
method is currently used as a supplement to the Docker compilation method to
facilitate developers and users without a Docker environment to compile Doris
source code.
-> You can still compile the latest code using the Docker development image:
`apache/incubator-doris:build-env-ldb-toolchain-latest`
+> You can still compile the latest code using the Docker development image:
`apache/doris:build-env-ldb-toolchain-latest`
> Thanks to [Amos Bird](https://github.com/amosbird) for this contribution.
@@ -93,7 +93,7 @@ This works for most Linux distributions (CentOS, Ubuntu,
etc.).
4. Download Doris source code
```
- git clone https://github.com/apache/incubator-doris.git
+ git clone https://github.com/apache/doris.git
```
After downloading, go to the Doris source directory, create the
`custom_env.sh`, file, and set the PATH environment variable, e.g.
diff --git a/docs/install/source-install/compilation.md
b/docs/install/source-install/compilation.md
index 7543097ed31..2b17a377958 100644
--- a/docs/install/source-install/compilation.md
+++ b/docs/install/source-install/compilation.md
@@ -1,155 +1,159 @@
-* <!--
- 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
+---
+{
+ "title": "Compilation",
+ "language": "en"
+}
+---
- http://www.apache.org/licenses/LICENSE-2.0
+<!--
+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
- 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.
+-->
- # Compilation
- This document focuses on how to code Doris through source code.
+# Compilation
- ## Developing mirror compilation using Docker (recommended)
+This document focuses on how to code Doris through source code.
- ### Use off-the-shelf mirrors
+## Developing mirror compilation using Docker (recommended)
- 1. Download Docker Mirror
+### Use off-the-shelf mirrors
- `$ docker pull apache/doris:build-env-ldb-toolchain-latest`
+1. Download Docker Mirror
- Check mirror download completed:
+ `$ docker pull apache/doris:build-env-ldb-toolchain-latest`
- ```
- $ docker images
- REPOSITORY TAG IMAGE ID
CREATED SIZE
- apache/doris build-env-ldb-toolchain-latest 49f68cecbc1a 4
days ago 3.76GB
- ```
+ Check mirror download completed:
- > Note1: For different versions of Doris, you need to download the
corresponding mirror version. From Apache Doris 0.15 version, the docker image
will keep same version number with Doris. For example, you can use
`apache/doris:build-env-for-0.15.0` to compile Apache Doris 0.15.0.
- >
- > Node2: `apache/doris:build-env-ldb-toolchain-latest` is for compiling
trunk code, and will be updated along with trunk code. View the update time in
`docker/README.md`
-
- | image version | commit id
| release version |
- | ------------------------------------------- |
------------------------------------------------------------ | --------------- |
- | apache/incubator-doris:build-env | before
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.8.x, 0.9.x |
- | apache/incubator-doris:build-env-1.1 |
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
or later | 0.10.x or later |
- | apache/incubator-doris:build-env-1.2 |
[4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8)
or later | 0.12.x - 0.14.0 |
- | apache/incubator-doris:build-env-1.3.1 |
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
or later | 0.14.x |
- | apache/doris:build-env-for-0.15.0 |
[a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54)
or later | 0.15.0 |
- | apache/incubator-doris:build-env-latest | before
[0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824)
| |
- | apache/doris:build-env-for-1.0.0 |
| 1.0.0 |
- | apache/doris:build-env-for-1.1.0 |
| 1.1.0 |
- | apache/doris:build-env-ldb-toolchain-latest | trunk
| trunk |
-
- **note**:
-
- > 1. Dev docker image
[ChangeLog](https://github.com/apache/doris/blob/master/thirdparty/CHANGELOG.md)
-
- > 2. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to
compile, and the 0.14.x code will use apache/incubator-doris:build-env-1.3.1.
-
- > 3. From docker image of build-env-1.3.1, both OpenJDK 8 and OpenJDK 11 are
included, and OpenJDK 11 is used for compilation by default. Please make sure
that the JDK version used for compiling is the same as the JDK version used at
runtime, otherwise it may cause unexpected operation errors. You can use the
following command to switch the default JDK version in container:
- >
- > Switch to JDK 8:
- >
- > ```
- > $ alternatives --set java java-1.8.0-openjdk.x86_64
- > $ alternatives --set javac java-1.8.0-openjdk.x86_64
- > $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
- > ```
- >
- > Switch to JDK 11:
- >
- > ```
- > $ alternatives --set java java-11-openjdk.x86_64
- > $ alternatives --set javac java-11-openjdk.x86_64
- > $ export JAVA_HOME=/usr/lib/jvm/java-11
- > ```
-
- 2. Running Mirror
-
- `$ docker run -it apache/doris:build-env-ldb-toolchain-latest`
-
- It is recommended to run the container by mounting the local Doris source
directory, so that the compiled binary file will be stored in the host machine
and will not disappear because the container exits.
-
- At the same time, it is recommended to mount the maven `.m2` directory
in the mirror to the host directory at the same time to prevent repeated
downloading of maven's dependent libraries each time the compilation is started.
+ ```
+ $ docker images
+ REPOSITORY TAG IMAGE ID
CREATED SIZE
+ apache/doris build-env-ldb-toolchain-latest 49f68cecbc1a 4 days
ago 3.76GB
+ ```
- ```
- $ docker run -it -v /your/local/.m2:/root/.m2 -v
/your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/
apache/doris:build-env-ldb-toolchain-latest
- ```
+> Note1: For different versions of Doris, you need to download the
corresponding mirror version. From Apache Doris 0.15 version, the docker image
will keep same version number with Doris. For example, you can use
`apache/doris:build-env-for-0.15.0` to compile Apache Doris 0.15.0.
+>
+> Node2: `apache/doris:build-env-ldb-toolchain-latest` is for compiling trunk
code, and will be updated along with trunk code. View the update time in
`docker/README.md`
- 3. Download source code
+| image version | commit id | release version |
+|---|---|---|
+| apache/incubator-doris:build-env | before
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.8.x, 0.9.x |
+| apache/incubator-doris:build-env-1.1 |
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
or later | 0.10.x or later |
+| apache/incubator-doris:build-env-1.2 |
[4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8)
or later | 0.12.x - 0.14.0 |
+| apache/incubator-doris:build-env-1.3.1 |
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
or later | 0.14.x |
+| apache/doris:build-env-for-0.15.0 |
[a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54)
or later | 0.15.0 |
+| apache/incubator-doris:build-env-latest | before
[0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824)
| |
+| apache/doris:build-env-for-1.0.0| | 1.0.0 |
+| apache/doris:build-env-for-1.1.0| | 1.1.0 |
+| apache/doris:build-env-ldb-toolchain-latest | trunk | trunk |
- After starting the mirror, you should be in the container. The Doris
source code can be downloaded from the following command (local source
directory mounted is not required):
+**note**:
- ```
- $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
- or
- $ git clone https://github.com/apache/doris.git
- ```
+> 1. Dev docker image
[ChangeLog](https://github.com/apache/doris/blob/master/thirdparty/CHANGELOG.md)
- 4. Compile Doris
+> 2. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to
compile, and the 0.14.x code will use apache/incubator-doris:build-env-1.3.1.
- First run the following command to check whether the compilation machine
supports the avx2 instruction set
+> 3. From docker image of build-env-1.3.1, both OpenJDK 8 and OpenJDK 11 are
included, and OpenJDK 11 is used for compilation by default. Please make sure
that the JDK version used for compiling is the same as the JDK version used at
runtime, otherwise it may cause unexpected operation errors. You can use the
following command to switch the default JDK version in container:
+>
+> Switch to JDK 8:
+>
+> ```
+> $ alternatives --set java java-1.8.0-openjdk.x86_64
+> $ alternatives --set javac java-1.8.0-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+> ```
+>
+> Switch to JDK 11:
+>
+> ```
+> $ alternatives --set java java-11-openjdk.x86_64
+> $ alternatives --set javac java-11-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-11
+> ```
- ```
- $ cat /proc/cpuinfo | grep avx2
- ```
+2. Running Mirror
+
+ `$ docker run -it apache/doris:build-env-ldb-toolchain-latest`
+
+ It is recommended to run the container by mounting the local Doris source
directory, so that the compiled binary file will be stored in the host machine
and will not disappear because the container exits.
- If it is not supported, use the following command to compile
+ At the same time, it is recommended to mount the maven `.m2` directory in
the mirror to the host directory at the same time to prevent repeated
downloading of maven's dependent libraries each time the compilation is started.
- ```
- $ USE_AVX2=0 sh build.sh
- ```
+ ```
+ $ docker run -it -v /your/local/.m2:/root/.m2 -v
/your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/
apache/doris:build-env-ldb-toolchain-latest
+ ```
- If supported, compile directly without adding USE_AVX2=0
+3. Download source code
- ```
- $ sh build.sh
- ```
+ After starting the mirror, you should be in the container. The Doris
source code can be downloaded from the following command (local source
directory mounted is not required):
- After compilation, the output files are in the `output/` directory.
+ ```
+ $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
+ or
+ $ git clone https://github.com/apache/doris.git
+ ```
- > **Note:**
- >
- > If you are using `build-env-for-0.15.0` or `build-env-for-1.0.0` for
the first time, use the following command when compiling:
- >
- > `sh build.sh --clean --be --fe --ui`
- >
- > `build-env-ldb-toolchain-latest` and later, use the following command:
- >
- > ```
- > sh build --clean --be --fe
- > ```
- >
- > This is because from build-env-for-0.15.0, we upgraded thrift (0.9 ->
0.13), you need to use the --clean command to force the use of the new version
of thrift to generate code files, otherwise incompatible code will appear.
+4. Compile Doris
- After compilation, the output file is in the `output/` directory.
+ First run the following command to check whether the compilation machine
supports the avx2 instruction set
+
+ ```
+ $ cat /proc/cpuinfo | grep avx2
+ ```
- ### Self-compiling Development Environment Mirror
+ If it is not supported, use the following command to compile
- You can also create a Doris development environment mirror yourself,
referring specifically to the `docker/README.md` file.
+ ```
+ $ USE_AVX2=0 sh build.sh
+ ```
+ If supported, compile directly without adding USE_AVX2=0
- ## Direct Compilation (CentOS/Ubuntu)
+ ```
+ $ sh build.sh
+ ```
- You can try to compile Doris directly in your own Linux environment.
+ After compilation, the output files are in the `output/` directory.
- 1. System Dependence
+ > **Note:**
+ >
+ > If you are using `build-env-for-0.15.0` or `build-env-for-1.0.0` for
the first time, use the following command when compiling:
+ >
+ > `sh build.sh --clean --be --fe --ui`
+ >
+ > `build-env-ldb-toolchain-latest` and later, use the following command:
+ >
+ > ` sh build --clean --be --fe`
+ >
+ > This is because from build-env-for-0.15.0, we upgraded thrift (0.9 ->
0.13), you need to use the --clean command to force the use of the new version
of thrift to generate code files, otherwise incompatible code will appear.
+
+ After compilation, the output file is in the `output/` directory.
- * Before commit
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
will use the dependencies as follows:
+### Self-compiling Development Environment Mirror
+
+You can also create a Doris development environment mirror yourself, referring
specifically to the `docker/README.md` file.
+
+
+## Direct Compilation (CentOS/Ubuntu)
+
+You can try to compile Doris directly in your own Linux environment.
+
+1. System Dependence
+ * Before commit
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
will use the dependencies as follows:
`GCC 7.3+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.11+
Bison 3.0+`
@@ -165,7 +169,7 @@
`sudo yum groupinstall 'Development Tools' && sudo yum install maven
cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel
curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk`
- * After commit
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
will use the dependencies as follows:
+ * After commit
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
will use the dependencies as follows:
`GCC 10+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake
3.19.2+ Bison 3.0+`
@@ -180,7 +184,6 @@
ln -s /usr/bin/gcc-11 /usr/bin/gcc
sudo apt-get install autoconf automake libtool autopoint
```
-
If you are using CentOS you can use the following command to install
the dependencies
```
@@ -189,9 +192,7 @@
sudo yum install devtoolset-10
scl enable devtoolset-10 bash
```
-
If devtoolset-10 is not found in current repo. Oracle has already
rebuilt the devtoolset-10 packages. You can use this repo file:
-
```
[ol7_software_collections]
name=Software Collection packages for Oracle Linux 7 ($basearch)
@@ -200,73 +201,71 @@
gpgcheck=1
enabled=1
```
-
After installation, set environment variables `PATH`, `JAVA_HOME`, etc.
-
> nit: you can find the jdk install directory by using command
`alternatives --list`
Doris 0.14.0 will use gcc7 env to compile.
- 2. Compile Doris
+2. Compile Doris
- Compiling with the Docker development image, check whether the avx2
instruction is supported before compiling
+ Compiling with the Docker development image, check whether the avx2
instruction is supported before compiling
- ```
- $ cat /proc/cpuinfo | grep avx2
- ```
+ ```
+ $ cat /proc/cpuinfo | grep avx2
+ ```
- If supported, use the following command to compile
+ If supported, use the following command to compile
- ```
- $ sh build.sh
- ```
+ ```
+ $ sh build.sh
+ ```
- If it is not supported, you need to add USE_AVX2=0
+ If it is not supported, you need to add USE_AVX2=0
- ```
- $ USE_AVX2=0 sh build.sh
- ```
+ ```
+ $ USE_AVX2=0 sh build.sh
+ ```
- After compilation, the output files are in the `output/` directory.
+ After compilation, the output files are in the `output/` directory.
- ## FAQ
+## FAQ
- 1. `Could not transfer artifact
net.sourceforge.czt.dev:cup-maven-plugin:pom:1.6-cdh from/to xxx`
+1. `Could not transfer artifact
net.sourceforge.czt.dev:cup-maven-plugin:pom:1.6-cdh from/to xxx`
- If you encounter the above error, please refer to [PR
#4769](https://github.com/apache/doris/pull/4769/files) to modify the
cloudera-related repo configuration in `fe/pom.xml`.
+ If you encounter the above error, please refer to [PR
#4769](https://github.com/apache/doris/pull/4769/files) to modify the
cloudera-related repo configuration in `fe/pom.xml`.
- 2. The third party relies on download connection errors, failures, etc.
+2. The third party relies on download connection errors, failures, etc.
The download links of the third-party libraries that Doris relies on are
all in the `thirdparty/vars.sh` file. Over time, some download connections may
fail. If you encounter this situation. It can be solved in the following two
ways:
1. Manually modify the `thirdparty/vars.sh` file
- Manually modify the problematic download connection and the
corresponding MD5 value.
+ Manually modify the problematic download connection and the
corresponding MD5 value.
2. Use a third-party download warehouse:
- ```
- export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
- sh build-thirdparty.sh
- ```
+ ```
+ export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
+ sh build-thirdparty.sh
+ ```
- REPOSITORY_URL contains all third-party library source code packages
and their historical versions.
+ REPOSITORY_URL contains all third-party library source code packages
and their historical versions.
- ## Special statement
+## Special statement
- Starting from version 0.13, the dependency on the two third-party libraries
[1] and [2] will be removed in the default compiled output. These two
third-party libraries are under [GNU General Public License
V3](https://www.gnu.org/licenses/gpl-3.0.en.html). This license is incompatible
with [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), so it
should not appear in the Apache release by default.
+Starting from version 0.13, the dependency on the two third-party libraries
[1] and [2] will be removed in the default compiled output. These two
third-party libraries are under [GNU General Public License
V3](https://www.gnu.org/licenses/gpl-3.0.en.html). This license is incompatible
with [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), so it
should not appear in the Apache release by default.
- Remove library [1] will result in the inability to access MySQL external
tables. The feature of accessing MySQL external tables will be implemented
through `UnixODBC` in future release version.
+Remove library [1] will result in the inability to access MySQL external
tables. The feature of accessing MySQL external tables will be implemented
through `UnixODBC` in future release version.
- Remove library [2] will cause some data written in earlier versions (before
version 0.8) to be unable to read. Because the data in the earlier version was
compressed using the LZO algorithm, in later versions, it has been changed to
the LZ4 compression algorithm. We will provide tools to detect and convert this
part of the data in the future.
+Remove library [2] will cause some data written in earlier versions (before
version 0.8) to be unable to read. Because the data in the earlier version was
compressed using the LZO algorithm, in later versions, it has been changed to
the LZ4 compression algorithm. We will provide tools to detect and convert this
part of the data in the future.
- If required, users can continue to use these two dependent libraries. If you
want to use it, you need to add the following options when compiling:
+If required, users can continue to use these two dependent libraries. If you
want to use it, you need to add the following options when compiling:
- ```
- WITH_MYSQL=1 WITH_LZO=1 sh build.sh
- ```
+```
+WITH_MYSQL=1 WITH_LZO=1 sh build.sh
+```
- Note that when users rely on these two third-party libraries, Doris is not
used under the Apache License 2.0 by default. Please pay attention to the GPL
related agreements.
+Note that when users rely on these two third-party libraries, Doris is not
used under the Apache License 2.0 by default. Please pay attention to the GPL
related agreements.
- * [1] mysql-5.7.18
- * [2] lzo-2.10
+* [1] mysql-5.7.18
+* [2] lzo-2.10
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-arm.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-arm.md
index c5565752f5a..10d21efaf28 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-arm.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-arm.md
@@ -333,7 +333,7 @@ under the License.
```shell
cd /opt
-git clone https://github.com/apache/incubator-doris.git
+git clone https://github.com/apache/doris.git
```
#### 安装部署
@@ -375,7 +375,7 @@ USE_AVX2=OFF sh build.sh
```shell
export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
- sh /opt/incubator-doris/thirdparty/build-thirdparty.sh
+ sh /opt/doris/thirdparty/build-thirdparty.sh
```
REPOSITORY_URL 中包含所有第三方库源码包和他们的历史版本。
@@ -386,7 +386,7 @@ USE_AVX2=OFF sh build.sh
- 执行 build.sh 时抛出异常
- > /opt/incubator-doris/env.sh: line 46: python: command not found
+ > /opt/doris/env.sh: line 46: python: command not found
>
> Python 2.7.18
@@ -519,8 +519,8 @@ USE_AVX2=OFF sh build.sh
将 ldb/aclocal 目录下的 `pkg.m4` 文件拷贝至 libxml2/m4 目录下，重新编译第三方库
```shell
- cp /opt/software/ldb_toolchain/share/aclocal/pkg.m4
/opt/incubator-doris/thirdparty/src/libxml2-v2.9.10/m4
- sh /opt/incubator-doris/thirdparty/build-thirdparty.sh
+ cp /opt/software/ldb_toolchain/share/aclocal/pkg.m4
/opt/doris/thirdparty/src/libxml2-v2.9.10/m4
+ sh /opt/doris/thirdparty/build-thirdparty.sh
```
9. 执行测试 CURL_HAS_TLS_PROXY 失败
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-with-ldb-toolchain.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-with-ldb-toolchain.md
index 42468b5e2ae..b922c179e0c 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-with-ldb-toolchain.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation-with-ldb-toolchain.md
@@ -28,7 +28,7 @@ under the License.
本文档主要介绍如何使用 LDB toolchain 编译 Doris。该方式目前作为 Docker 编译方式的补充，方便没有 Docker
环境的开发者和用户编译 Doris 源码。
-> 您依然可以使用 Docker
开发镜像编译最新代码：`apache/incubator-doris:build-env-ldb-toolchain-latest`
+> 您依然可以使用 Docker 开发镜像编译最新代码：`apache/doris:build-env-ldb-toolchain-latest`
> 感谢 [Amos Bird](https://github.com/amosbird) 的贡献。
@@ -93,7 +93,7 @@ under the License.
4. 下载 Doris 源码
```
- git clone https://github.com/apache/incubator-doris.git
+ git clone https://github.com/apache/doris.git
```
下载完成后，进入到 doris 源码目录，创建 `custom_env.sh`，文件，并设置 PATH 环境变量，如：
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
index 7e7d48df4f8..e52e5a1d8c2 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
@@ -1,6 +1,6 @@
---
{
- "title": "Doris 编译",
+ "title": "Doris编译",
"language": "zh-CN"
}
---
@@ -39,26 +39,26 @@ under the License.
检查镜像下载完成：
```
- $ docker images
- REPOSITORY TAG IMAGE ID
CREATED SIZE
- apache/doris build-env-ldb-toolchain-latest 49f68cecbc1a 4 days
ago 3.76GB
+ $ docker images
+ REPOSITORY TAG IMAGE ID
CREATED SIZE
+ apache/doris build-env-ldb-toolchain-latest 49f68cecbc1a 4 days
ago 3.76GB
```
> 注1：针对不同的 Doris 版本，需要下载对应的镜像版本。从 Apache Doris 0.15 版本起，后续镜像版本号将与 Doris
> 版本号统一。比如可以使用 `apache/doris:build-env-for-0.15.0 ` 来编译 0.15.0 版本。
>
> 注2：`apache/doris:build-env-ldb-toolchain-latest`
> 用于编译最新主干版本代码，会随主干版本不断更新。可以查看 `docker/README.md` 中的更新时间。
-| 镜像版本 | commit id
| doris 版本 |
-| ------------------------------------------- |
------------------------------------------------------------ | --------------- |
-| apache/incubator-doris:build-env | before
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.8.x, 0.9.x |
-| apache/incubator-doris:build-env-1.1 |
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.10.x, 0.11.x |
-| apache/incubator-doris:build-env-1.2 |
[4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8)
| 0.12.x - 0.14.0 |
-| apache/incubator-doris:build-env-1.3.1 |
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
| 0.14.x |
-| apache/doris:build-env-for-0.15.0 |
[a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54)
or later | 0.15.0 |
-| apache/incubator-doris:build-env-latest | before
[0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824)
| |
-| apache/doris:build-env-for-1.0.0 |
| 1.0.0 |
-| apache/doris:build-env-for-1.1.0 |
| 1.1.0 |
-| apache/doris:build-env-ldb-toolchain-latest | trunk
| |
+| 镜像版本 | commit id | doris 版本 |
+|---|---|---|
+| apache/incubator-doris:build-env | before
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.8.x, 0.9.x |
+| apache/incubator-doris:build-env-1.1 |
[ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81)
| 0.10.x, 0.11.x |
+| apache/incubator-doris:build-env-1.2 |
[4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8)
| 0.12.x - 0.14.0 |
+| apache/incubator-doris:build-env-1.3.1 |
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
| 0.14.x |
+| apache/doris:build-env-for-0.15.0 |
[a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54)
or later | 0.15.0 |
+| apache/incubator-doris:build-env-latest | before
[0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824)
| |
+| apache/doris:build-env-for-1.0.0| | 1.0.0 |
+| apache/doris:build-env-for-1.1.0| | 1.1.0 |
+| apache/doris:build-env-ldb-toolchain-latest | trunk | |
**注意**：
@@ -67,21 +67,21 @@ under the License.
> 2. doris 0.14.0 版本仍然使用apache/incubator-doris:build-env-1.2 编译，0.14.x
> 版本的代码将使用apache/incubator-doris:build-env-1.3.1。
> 3. 从 build-env-1.3.1 的docker镜像起，同时包含了 OpenJDK 8 和 OpenJDK 11，并且默认使用 OpenJDK
> 11 编译。请确保编译使用的 JDK 版本和运行时使用的 JDK
> 版本一致，否则会导致非预期的运行错误。你可以在进入编译镜像的容器后，使用以下命令切换默认 JDK 版本：
->
-> 切换到 JDK 8：
->
+ >
+ > 切换到 JDK 8：
+ >
+ > ```
+> $ alternatives --set java java-1.8.0-openjdk.x86_64
+> $ alternatives --set javac java-1.8.0-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
> ```
-> $ alternatives --set java java-1.8.0-openjdk.x86_64
-> $ alternatives --set javac java-1.8.0-openjdk.x86_64
-> $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
-> ```
->
-> 切换到 JDK 11：
->
-> ```
-> $ alternatives --set java java-11-openjdk.x86_64
-> $ alternatives --set javac java-11-openjdk.x86_64
-> $ export JAVA_HOME=/usr/lib/jvm/java-11
+ >
+ > 切换到 JDK 11：
+ >
+ > ```
+> $ alternatives --set java java-11-openjdk.x86_64
+> $ alternatives --set javac java-11-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-11
> ```
2. 运行镜像
@@ -93,7 +93,7 @@ under the License.
同时，建议同时将镜像中 maven 的 `.m2` 目录挂载到宿主机目录，以防止每次启动镜像编译时，重复下载 maven 的依赖库。
```
- $ docker run -it -v /your/local/.m2:/root/.m2 -v
/your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/
apache/doris:build-env-ldb-toolchain-latest
+ $ docker run -it -v /your/local/.m2:/root/.m2 -v
/your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/
apache/doris:build-env-ldb-toolchain-latest
```
3. 下载源码
@@ -101,45 +101,49 @@ under the License.
启动镜像后，你应该已经处于容器内。可以通过以下命令下载 Doris 源码（已挂载本地源码目录则不用）：
```
- $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
- or
- $ git clone https://github.com/apache/doris.git
+ $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
+ or
+ $ git clone https://github.com/apache/doris.git
```
4. 编译 Doris
先通过以下命令查看编译机器是否支持avx2指令集
-
+
```
$ cat /proc/cpuinfo | grep avx2
```
-
+
不支持则使用以下命令进行编译
-
+
```
$ USE_AVX2=0 sh build.sh
```
如果支持，可不加 USE_AVX2=0 ，直接进行编译
-
+
```
$ sh build.sh
```
-
+
编译完成后，产出文件在 `output/` 目录中。
-
+
>**注意:**
>
>如果你是第一次使用 `build-env-for-0.15.0` 或 `build-env-for-1.0.0`
的版本，第一次编译的时候要使用如下命令：
>
- >`sh build.sh --clean --be --fe --ui`
+ >```
+ >sh build.sh --clean --be --fe --ui
+ >```
>
>`build-env-ldb-toolchain-latest` 及之后的版本，使用如下命令：
>
- >`sh build --clean --be --fe`
+ >```
+ >sh build --clean --be --fe
+ >```
>
>这是因为 build-env-for-0.15.0 版本镜像升级了 thrift(0.9 -> 0.13)，需要通过 --clean
命令强制使用新版本的 thrift 生成代码文件，否则会出现不兼容的代码。
-
+
编译完成后，产出文件在 `output/` 目录中。
### 自行编译开发环境镜像
@@ -153,7 +157,6 @@ under the License.
1. 系统依赖
不同的版本依赖也不相同
-
* 在
[ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f)
之前版本依赖如下：
`GCC 7.3+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.11+
Bison 3.0+`
@@ -171,33 +174,29 @@ under the License.
`GCC 10+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.19.2+
Bison 3.0+`
如果使用Ubuntu 16.04 及以上系统 可以执行以下命令来安装依赖
-
```
- sudo apt install build-essential openjdk-8-jdk maven cmake byacc flex
automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev
curl git ninja-build python
- sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
- sudo apt update
- sudo apt install gcc-10 g++-10
- sudo apt-get install autoconf automake libtool autopoint
+ sudo apt install build-essential openjdk-8-jdk maven cmake byacc flex
automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev
curl git ninja-build python
+ sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+ sudo apt update
+ sudo apt install gcc-10 g++-10
+ sudo apt-get install autoconf automake libtool autopoint
```
如果是CentOS 可以执行以下命令
-
```
- sudo yum groupinstall 'Development Tools' && sudo yum install maven
cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel
curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk
- sudo yum install centos-release-scl
- sudo yum install devtoolset-10
- scl enable devtoolset-10 bash
+ sudo yum groupinstall 'Development Tools' && sudo yum install maven
cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel
curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk
+ sudo yum install centos-release-scl
+ sudo yum install devtoolset-10
+ scl enable devtoolset-10 bash
```
-
如果当前仓库没有提供devtoolset-10 可以添加如下repo 使用oracle 提供 package
-
```
- [ol7_software_collections]
- name=Software Collection packages for Oracle Linux 7 ($basearch)
-
baseurl=http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/$basearch/
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
- gpgcheck=1
- enabled=1
+ [ol7_software_collections]
+ name=Software Collection packages for Oracle Linux 7 ($basearch)
+
baseurl=http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/$basearch/
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+ gpgcheck=1
+ enabled=1
```
安装完成后，自行设置环境变量 `PATH`, `JAVA_HOME` 等。(可以通过`alternatives --list`命令找到jdk的安装目录)
@@ -205,24 +204,24 @@ under the License.
2. 编译 Doris
- 与使用 Docker 开发镜像编译一样，编译之前先检查是否支持avx2指令
+ 与使用 Docker 开发镜像编译一样，编译之前先检查是否支持avx2指令
- ```
+ ```
$ cat /proc/cpuinfo | grep avx2
```
-
+
支持则使用下面命令进行编译
```
$ sh build.sh
```
-
+
如不支持需要加 USE_AVX2=0
-
+
```
$ USE_AVX2=0 sh build.sh
```
-
+
编译完成后，产出文件在 `output/` 目录中。
## 常见问题
@@ -241,10 +240,10 @@ under the License.
2. 使用第三方下载仓库：
- ```
- export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
- sh build-thirdparty.sh
- ```
+ ```
+ export
REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
+ sh build-thirdparty.sh
+ ```
REPOSITORY_URL 中包含所有第三方库源码包和他们的历史版本。
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
