This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 48ac0d9591 [Refactor][doc]Modify the flink doris connector compilation
documentation (#9169)
48ac0d9591 is described below
commit 48ac0d959163b3c0252ecf0bec8b54ec133c3cac
Author: caoliang-web <[email protected]>
AuthorDate: Sat Apr 23 22:08:09 2022 +0800
[Refactor][doc]Modify the flink doris connector compilation documentation
(#9169)
---
docs/en/extending-doris/flink-doris-connector.md | 12 +++++-------
docs/en/extending-doris/spark-doris-connector.md | 12 +++++-------
docs/zh-CN/extending-doris/flink-doris-connector.md | 15 +++++++--------
docs/zh-CN/extending-doris/spark-doris-connector.md | 16 ++++++++--------
new-docs/en/ecosystem/flink-doris-connector.md | 14 ++++++--------
new-docs/en/ecosystem/spark-doris-connector.md | 12 +++++-------
new-docs/zh-CN/ecosystem/flink-doris-connector.md | 16 ++++++++--------
new-docs/zh-CN/ecosystem/spark-doris-connector.md | 17 ++++++++---------
8 files changed, 52 insertions(+), 62 deletions(-)
diff --git a/docs/en/extending-doris/flink-doris-connector.md
b/docs/en/extending-doris/flink-doris-connector.md
index 510677e188..08972d014a 100644
--- a/docs/en/extending-doris/flink-doris-connector.md
+++ b/docs/en/extending-doris/flink-doris-connector.md
@@ -60,22 +60,19 @@ Ready to work
#export MVN_BIN=
#export JAVA_HOME=
-##amend as below
-export THRIFT_BIN=./thirdparty/installed/bin（thrift installation directory）
+##amend as below,MacOS as an example
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
Install `thrift` 0.13.0 (Note: `Doris` 0.15 and the latest builds are based on
`thrift` 0.13.0, previous versions are still built with `thrift` 0.9.3)
Windows:
1. Download: `http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. Copy: Copy the file to `./thirdparty/installed/bin`
-
+ 2. Modify thrift-0.13.0.exe to thrift
MacOS:
1. Download: `brew install [email protected]`
- 2. Create a soft link:
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. default address: /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
Note: Executing `brew install [email protected]` on MacOS may report an error that
the version cannot be found. The solution is as follows, execute it in the
terminal:
1. `brew tap-new $USER/local-tap`
@@ -92,6 +89,7 @@ Linux:
6.`make`
7.`make install`
Check the version after installation is complete：thrift --version
+ Note: If you have compiled Doris, you do not need to install thrift, you
can directly use $DORIS_HOME/thirdparty/installed/bin/thrift
```
Execute following command in source dir:
diff --git a/docs/en/extending-doris/spark-doris-connector.md
b/docs/en/extending-doris/spark-doris-connector.md
index 18c55d419b..8a565f8509 100644
--- a/docs/en/extending-doris/spark-doris-connector.md
+++ b/docs/en/extending-doris/spark-doris-connector.md
@@ -56,22 +56,19 @@ Ready to work
#export MVN_BIN=
#export JAVA_HOME=
-##amend as below
-export THRIFT_BIN=./thirdparty/installed/bin（thrift installation directory）
+##amend as below,MacOS as an example
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
Install `thrift` 0.13.0 (Note: `Doris` 0.15 and the latest builds are based on
`thrift` 0.13.0, previous versions are still built with `thrift` 0.9.3)
Windows:
1. Download: `http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. Copy: Copy the file to `./thirdparty/installed/bin`
-
+ 2. Modify thrift-0.13.0.exe to thrift
MacOS:
1. Download: `brew install [email protected]`
- 2. Create a soft link:
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. default address: /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
Note: Executing `brew install [email protected]` on MacOS may report an error that
the version cannot be found. The solution is as follows, execute it in the
terminal:
1. `brew tap-new $USER/local-tap`
@@ -88,6 +85,7 @@ Linux:
6.`make`
7.`make install`
Check the version after installation is complete：thrift --version
+ Note: If you have compiled Doris, you do not need to install thrift, you
can directly use $DORIS_HOME/thirdparty/installed/bin/thrift
```
Execute following command in source dir
diff --git a/docs/zh-CN/extending-doris/flink-doris-connector.md
b/docs/zh-CN/extending-doris/flink-doris-connector.md
index d5ea7801e8..cd12cdd886 100644
--- a/docs/zh-CN/extending-doris/flink-doris-connector.md
+++ b/docs/zh-CN/extending-doris/flink-doris-connector.md
@@ -62,21 +62,20 @@ Flink Doris Connector 可以支持通过 Flink 操作（读取、插入、修改
#export MVN_BIN=
#export JAVA_HOME=
-##修改如下
-export THRIFT_BIN=./thirdparty/installed/bin
+##修改如下,MacOS为例
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
安装 `thrift` 0.13.0 版本(注意：`Doris` 0.15 和最新的版本基于 `thrift` 0.13.0 构建,
之前的版本依然使用`thrift` 0.9.3 构建)
Windows:
- 1. 下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. 拷贝：将文件拷贝至 `./thirdparty/installed/bin`
+
1.下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`(下载目录自己指定)
+ 2.修改thrift-0.13.0.exe 为 thrift
MacOS:
1. 下载：`brew install [email protected]`
- 2. 建立软链接：
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. 默认下载地址：/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
+
注：MacOS执行 `brew install [email protected]` 可能会报找不到版本的错误，解决方法如下，在终端执行：
1. `brew tap-new $USER/local-tap`
@@ -93,7 +92,7 @@ export THRIFT_BIN=./thirdparty/installed/bin
6.`make`
7.`make install`
安装完成后查看版本：thrift --version
-
+ 注：如果编译过Doris，则不需要安装thrift,可以直接使用 $DORIS_HOME/thirdparty/installed/bin/thrift
```
在源码目录下执行：
diff --git a/docs/zh-CN/extending-doris/spark-doris-connector.md
b/docs/zh-CN/extending-doris/spark-doris-connector.md
index e4fed7a7cd..9773a63e6b 100644
--- a/docs/zh-CN/extending-doris/spark-doris-connector.md
+++ b/docs/zh-CN/extending-doris/spark-doris-connector.md
@@ -56,21 +56,20 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据
#export MVN_BIN=
#export JAVA_HOME=
-##修改如下
-export THRIFT_BIN=./thirdparty/installed/bin
+##修改如下,MacOS为例
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
安装 `thrift` 0.13.0 版本(注意：`Doris` 0.15 和最新的版本基于 `thrift` 0.13.0 构建,
之前的版本依然使用`thrift` 0.9.3 构建)
Windows:
- 1. 下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. 拷贝：将文件拷贝至 `./thirdparty/installed/bin`
+
1.下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`(下载目录自己指定)
+ 2.修改thrift-0.13.0.exe 为 thrift
MacOS:
1. 下载：`brew install [email protected]`
- 2. 建立软链接：
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. 默认下载地址：/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
+
注：MacOS执行 `brew install [email protected]` 可能会报找不到版本的错误，解决方法如下，在终端执行：
1. `brew tap-new $USER/local-tap`
@@ -86,7 +85,8 @@ export THRIFT_BIN=./thirdparty/installed/bin
5.`./configure --without-tests`
6.`make`
7.`make install`
- 安装完成后查看版本：thrift --version
+ 安装完成后查看版本：thrift --version
+ 注：如果编译过Doris，则不需要安装thrift,可以直接使用 $DORIS_HOME/thirdparty/installed/bin/thrift
```
在源码目录下执行：
diff --git a/new-docs/en/ecosystem/flink-doris-connector.md
b/new-docs/en/ecosystem/flink-doris-connector.md
index 89e4199a0a..096f6bb5ba 100644
--- a/new-docs/en/ecosystem/flink-doris-connector.md
+++ b/new-docs/en/ecosystem/flink-doris-connector.md
@@ -60,22 +60,19 @@ Ready to work
#export MVN_BIN=
#export JAVA_HOME=
-##amend as below
-export THRIFT_BIN=./thirdparty/installed/bin（thrift installation directory）
+##amend as below,MacOS as an example
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
Install `thrift` 0.13.0 (Note: `Doris` 0.15 and the latest builds are based on
`thrift` 0.13.0, previous versions are still built with `thrift` 0.9.3)
Windows:
1. Download: `http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. Copy: Copy the file to `./thirdparty/installed/bin`
-
+ 2. Modify thrift-0.13.0.exe to thrift
MacOS:
1. Download: `brew install [email protected]`
- 2. Create a soft link:
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. default address: /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
Note: Executing `brew install [email protected]` on MacOS may report an error that
the version cannot be found. The solution is as follows, execute it in the
terminal:
1. `brew tap-new $USER/local-tap`
@@ -91,7 +88,8 @@ Linux:
5.`./configure --without-tests`
6.`make`
7.`make install`
- Check the version after installation is complete：thrift --version
+ Check the version after installation is complete：thrift --version
+ Note: If you have compiled Doris, you do not need to install thrift, you
can directly use $DORIS_HOME/thirdparty/installed/bin/thrift
```
Execute following command in source dir:
diff --git a/new-docs/en/ecosystem/spark-doris-connector.md
b/new-docs/en/ecosystem/spark-doris-connector.md
index 18c55d419b..8a565f8509 100644
--- a/new-docs/en/ecosystem/spark-doris-connector.md
+++ b/new-docs/en/ecosystem/spark-doris-connector.md
@@ -56,22 +56,19 @@ Ready to work
#export MVN_BIN=
#export JAVA_HOME=
-##amend as below
-export THRIFT_BIN=./thirdparty/installed/bin（thrift installation directory）
+##amend as below,MacOS as an example
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
Install `thrift` 0.13.0 (Note: `Doris` 0.15 and the latest builds are based on
`thrift` 0.13.0, previous versions are still built with `thrift` 0.9.3)
Windows:
1. Download: `http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. Copy: Copy the file to `./thirdparty/installed/bin`
-
+ 2. Modify thrift-0.13.0.exe to thrift
MacOS:
1. Download: `brew install [email protected]`
- 2. Create a soft link:
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. default address: /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
Note: Executing `brew install [email protected]` on MacOS may report an error that
the version cannot be found. The solution is as follows, execute it in the
terminal:
1. `brew tap-new $USER/local-tap`
@@ -88,6 +85,7 @@ Linux:
6.`make`
7.`make install`
Check the version after installation is complete：thrift --version
+ Note: If you have compiled Doris, you do not need to install thrift, you
can directly use $DORIS_HOME/thirdparty/installed/bin/thrift
```
Execute following command in source dir
diff --git a/new-docs/zh-CN/ecosystem/flink-doris-connector.md
b/new-docs/zh-CN/ecosystem/flink-doris-connector.md
index a1029afa70..9832d9c026 100644
--- a/new-docs/zh-CN/ecosystem/flink-doris-connector.md
+++ b/new-docs/zh-CN/ecosystem/flink-doris-connector.md
@@ -62,21 +62,20 @@ Flink Doris Connector 可以支持通过 Flink 操作（读取、插入、修改
#export MVN_BIN=
#export JAVA_HOME=
-##修改如下
-export THRIFT_BIN=./thirdparty/installed/bin
+##修改如下,MacOS为例
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
安装 `thrift` 0.13.0 版本(注意：`Doris` 0.15 和最新的版本基于 `thrift` 0.13.0 构建,
之前的版本依然使用`thrift` 0.9.3 构建)
Windows:
- 1. 下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. 拷贝：将文件拷贝至 `./thirdparty/installed/bin`
+
1.下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`(下载目录自己指定)
+ 2.修改thrift-0.13.0.exe 为 thrift
MacOS:
1. 下载：`brew install [email protected]`
- 2. 建立软链接：
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. 默认下载地址：/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
+
注：MacOS执行 `brew install [email protected]` 可能会报找不到版本的错误，解决方法如下，在终端执行：
1. `brew tap-new $USER/local-tap`
@@ -92,7 +91,8 @@ export THRIFT_BIN=./thirdparty/installed/bin
5.`./configure --without-tests`
6.`make`
7.`make install`
- 安装完成后查看版本：thrift --version
+ 安装完成后查看版本：thrift --version
+ 注：如果编译过Doris，则不需要安装thrift,可以直接使用 $DORIS_HOME/thirdparty/installed/bin/thrift
```
在源码目录下执行：
diff --git a/new-docs/zh-CN/ecosystem/spark-doris-connector.md
b/new-docs/zh-CN/ecosystem/spark-doris-connector.md
index ed0bc24cd0..5b8c7e8006 100644
--- a/new-docs/zh-CN/ecosystem/spark-doris-connector.md
+++ b/new-docs/zh-CN/ecosystem/spark-doris-connector.md
@@ -56,21 +56,20 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据
#export MVN_BIN=
#export JAVA_HOME=
-##修改如下
-export THRIFT_BIN=./thirdparty/installed/bin（thrift的安装目录）
+##修改如下,MacOS为例
+export THRIFT_BIN=/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
#export MVN_BIN=
#export JAVA_HOME=
安装 `thrift` 0.13.0 版本(注意：`Doris` 0.15 和最新的版本基于 `thrift` 0.13.0 构建,
之前的版本依然使用`thrift` 0.9.3 构建)
Windows:
- 1. 下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`
- 2. 拷贝：将文件拷贝至 `./thirdparty/installed/bin`
+
1.下载：`http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.exe`(下载目录自己指定)
+ 2.修改thrift-0.13.0.exe 为 thrift
MacOS:
1. 下载：`brew install [email protected]`
- 2. 建立软链接：
- `mkdir -p ./thirdparty/installed/bin`
- `ln -s /opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
./thirdparty/installed/bin/thrift`
+ 2. 默认下载地址：/opt/homebrew/Cellar/[email protected]/0.13.0/bin/thrift
+
注：MacOS执行 `brew install [email protected]` 可能会报找不到版本的错误，解决方法如下，在终端执行：
1. `brew tap-new $USER/local-tap`
@@ -86,8 +85,8 @@ export THRIFT_BIN=./thirdparty/installed/bin（thrift的安装目录）
5.`./configure --without-tests`
6.`make`
7.`make install`
- 安装完成后查看版本：thrift --version
-
+ 安装完成后查看版本：thrift --version
+ 注：如果编译过Doris，则不需要安装thrift,可以直接使用 $DORIS_HOME/thirdparty/installed/bin/thrift
```
在源码目录下执行：
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
