This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 65305f66c0945f387377d91670e5b3960ed429f1 Author: caoliang-web <71004656+caoliang-...@users.noreply.github.com> AuthorDate: Wed Jan 31 15:14:31 2024 +0800 [typo](doc)Update flink Spark connector documentation (#30565) --- docs/en/docs/ecosystem/flink-doris-connector.md | 18 +++++++++--------- docs/en/docs/ecosystem/spark-doris-connector.md | 4 ++-- docs/zh-CN/docs/ecosystem/flink-doris-connector.md | 18 +++++++++--------- docs/zh-CN/docs/ecosystem/spark-doris-connector.md | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/en/docs/ecosystem/flink-doris-connector.md b/docs/en/docs/ecosystem/flink-doris-connector.md index 98ec7fdbe6c..92e0166fcc6 100644 --- a/docs/en/docs/ecosystem/flink-doris-connector.md +++ b/docs/en/docs/ecosystem/flink-doris-connector.md @@ -38,13 +38,13 @@ under the License. ## Version Compatibility | Connector Version | Flink Version | Doris Version | Java Version | Scala Version | -| --------- | ----- | ------ | ---- | ----- | -| 1.0.3 | 1.11+ | 0.15+ | 8 | 2.11,2.12 | -| 1.1.1 | 1.14 | 1.0+ | 8 | 2.11,2.12 | -| 1.2.1 | 1.15 | 1.0+ | 8 | - | -| 1.3.0 | 1.16 | 1.0+ | 8 | - | -| 1.4.0 | 1.15,1.16,1.17 | 1.0+ | 8 |- | -| 1.5.0 | 1.15,1.16,1.17,1.18 | 1.0+ | 8 |- | +|-------------------| ----- | ------ | ---- | ----- | +| 1.0.3 | 1.11+ | 0.15+ | 8 | 2.11,2.12 | +| 1.1.1 | 1.14 | 1.0+ | 8 | 2.11,2.12 | +| 1.2.1 | 1.15 | 1.0+ | 8 | - | +| 1.3.0 | 1.16 | 1.0+ | 8 | - | +| 1.4.0 | 1.15,1.16,1.17 | 1.0+ | 8 |- | +| 1.5.2 | 1.15,1.16,1.17,1.18 | 1.0+ | 8 |- | ## USE @@ -311,14 +311,14 @@ ON a.city = c.city ### General configuration items | Key | Default Value | Required | Comment | -| -------------------------------- | ------------- | -------- | ------------------------------------------------------------ | +| -------------------------------- |---------------| -------- | ------------------------------------------------------------ | | fenodes | -- | Y | Doris FE http address, multiple addresses are supported, separated by commas | | benodes | -- | N | Doris BE http address, multiple addresses are supported, separated by commas. refer to [#187](https://github.com/apache/doris-flink-connector/pull/187) | | jdbc-url | -- | N | jdbc connection information, such as: jdbc:mysql://127.0.0.1:9030 | | table.identifier | -- | Y | Doris table name, such as: db.tbl | | username | -- | Y | username to access Doris | | password | -- | Y | Password to access Doris | -| auto-redirect | false | N | Whether to redirect StreamLoad requests. After being turned on, StreamLoad will be written through FE, and BE information will no longer be displayed. At the same time, it can also be written to SelectDB Cloud by turning on this parameter. | +| auto-redirect | true | N | Whether to redirect StreamLoad requests. After being turned on, StreamLoad will be written through FE, and BE information will no longer be displayed. | | doris.request.retries | 3 | N | Number of retries to send requests to Doris | | doris.request.connect.timeout.ms | 30000 | N | Connection timeout for sending requests to Doris | | doris.request.read.timeout.ms | 30000 | N | Read timeout for sending requests to Doris | diff --git a/docs/en/docs/ecosystem/spark-doris-connector.md b/docs/en/docs/ecosystem/spark-doris-connector.md index 80874436421..2e325e244b9 100644 --- a/docs/en/docs/ecosystem/spark-doris-connector.md +++ b/docs/en/docs/ecosystem/spark-doris-connector.md @@ -39,7 +39,7 @@ Github: https://github.com/apache/doris-spark-connector | Connector | Spark | Doris | Java | Scala | |-----------|---------------------|-------------|------|------------| -| 1.3.0 | 3.4 ~ 3.1, 2.4, 2.3 | 1.0 + | 8 | 2.12, 2.11 | +| 1.3.1 | 3.4 ~ 3.1, 2.4, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.2.0 | 3.2, 3.1, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.1.0 | 3.2, 3.1, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.0.1 | 3.1, 2.3 | 0.12 - 0.15 | 8 | 2.12, 2.11 | @@ -274,7 +274,7 @@ kafkaSource.selectExpr("CAST(key AS STRING)", "CAST(value as STRING)") | doris.sink.task.use.repartition | false | Whether to use repartition mode to control the number of partitions written by Doris. The default value is false, and coalesce is used (note: if there is no Spark action before the write, the whole computation will be less parallel). If it is set to true, then repartition is used (note: you can set the final number of partitions at the cost of shuffle). [...] | doris.sink.batch.interval.ms | 50 | The interval time of each batch sink, unit ms. [...] | doris.sink.enable-2pc | false | Whether to enable two-stage commit. When enabled, transactions will be committed at the end of the job, and all pre-commit transactions will be rolled back when some tasks fail. [...] -| doris.sink.auto-redirect | false | Whether to redirect StreamLoad requests. After being turned on, StreamLoad will write through FE and no longer obtain BE information explicitly. | +| doris.sink.auto-redirect | true | Whether to redirect StreamLoad requests. After being turned on, StreamLoad will write through FE and no longer obtain BE information explicitly. | ### SQL & Dataframe Configuration diff --git a/docs/zh-CN/docs/ecosystem/flink-doris-connector.md b/docs/zh-CN/docs/ecosystem/flink-doris-connector.md index 9c367fbcd3f..439660ceab6 100644 --- a/docs/zh-CN/docs/ecosystem/flink-doris-connector.md +++ b/docs/zh-CN/docs/ecosystem/flink-doris-connector.md @@ -40,13 +40,13 @@ under the License. ## 版本兼容 | Connector Version | Flink Version | Doris Version | Java Version | Scala Version | -| --------- | ----- | ------ | ---- | ----- | -| 1.0.3 | 1.11+ | 0.15+ | 8 | 2.11,2.12 | -| 1.1.1 | 1.14 | 1.0+ | 8 | 2.11,2.12 | -| 1.2.1 | 1.15 | 1.0+ | 8 | - | -| 1.3.0 | 1.16 | 1.0+ | 8 | - | -| 1.4.0 | 1.15,1.16,1.17 | 1.0+ | 8 |- | -| 1.5.0 | 1.15,1.16,1.17,1.18 | 1.0+ | 8 |- | +|-------------------| ----- | ------ | ---- | ----- | +| 1.0.3 | 1.11+ | 0.15+ | 8 | 2.11,2.12 | +| 1.1.1 | 1.14 | 1.0+ | 8 | 2.11,2.12 | +| 1.2.1 | 1.15 | 1.0+ | 8 | - | +| 1.3.0 | 1.16 | 1.0+ | 8 | - | +| 1.4.0 | 1.15,1.16,1.17 | 1.0+ | 8 |- | +| 1.5.2 | 1.15,1.16,1.17,1.18 | 1.0+ | 8 |- | ## 使用 @@ -314,14 +314,14 @@ ON a.city = c.city ### 通用配置项 | Key | Default Value | Required | Comment | -| -------------------------------- | ------------- | -------- | ------------------------------------------------------------ | +| -------------------------------- |---------------| -------- | ------------------------------------------------------------ | | fenodes | -- | Y | Doris FE http 地址, 支持多个地址,使用逗号分隔 | | benodes | -- | N | Doris BE http 地址, 支持多个地址,使用逗号分隔,参考[#187](https://github.com/apache/doris-flink-connector/pull/187) | | jdbc-url | -- | N | jdbc连接信息,如: jdbc:mysql://127.0.0.1:9030 | | table.identifier | -- | Y | Doris 表名,如:db.tbl | | username | -- | Y | 访问 Doris 的用户名 | | password | -- | Y | 访问 Doris 的密码 | -| auto-redirect | false | N | 是否重定向StreamLoad请求。开启后StreamLoad将通过FE写入,不再显示获取BE信息,同时也可通过开启该参数写入SelectDB Cloud | +| auto-redirect | true | N | 是否重定向StreamLoad请求。开启后StreamLoad将通过FE写入,不再显示获取BE信息 | | doris.request.retries | 3 | N | 向 Doris 发送请求的重试次数 | | doris.request.connect.timeout.ms | 30000 | N | 向 Doris 发送请求的连接超时时间 | | doris.request.read.timeout.ms | 30000 | N | 向 Doris 发送请求的读取超时时间 | diff --git a/docs/zh-CN/docs/ecosystem/spark-doris-connector.md b/docs/zh-CN/docs/ecosystem/spark-doris-connector.md index 8c4c84ad663..50442236889 100644 --- a/docs/zh-CN/docs/ecosystem/spark-doris-connector.md +++ b/docs/zh-CN/docs/ecosystem/spark-doris-connector.md @@ -39,7 +39,7 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据 | Connector | Spark | Doris | Java | Scala | |-----------|---------------------|-------------|------|------------| -| 1.3.0 | 3.4 ~ 3.1, 2.4, 2.3 | 1.0 + | 8 | 2.12, 2.11 | +| 1.3.1 | 3.4 ~ 3.1, 2.4, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.2.0 | 3.2, 3.1, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.1.0 | 3.2, 3.1, 2.3 | 1.0 + | 8 | 2.12, 2.11 | | 1.0.1 | 3.1, 2.3 | 0.12 - 0.15 | 8 | 2.12, 2.11 | @@ -278,7 +278,7 @@ kafkaSource.selectExpr("CAST(value as STRING)") | doris.sink.task.use.repartition | false | 是否采用 repartition 方式控制 Doris写入 Partition数。默认值为 false,采用 coalesce 方式控制(注意: 如果在写入之前没有 Spark action 算子,可能会导致整个计算并行度降低)。<br/>如果设置为 true,则采用 repartition 方式(注意: 可设置最后 Partition 数,但会额外增加 shuffle 开销)。 | | doris.sink.batch.interval.ms | 50 | 每个批次sink的间隔时间,单位 ms。 | | doris.sink.enable-2pc | false | 是否开启两阶段提交。开启后将会在作业结束时提交事务,而部分任务失败时会将所有预提交状态的事务会滚。 | -| doris.sink.auto-redirect | false | 是否重定向 StreamLoad 请求。开启后 StreamLoad 将通过 FE 写入, 不再显式获取 BE 信息。 | +| doris.sink.auto-redirect | true | 是否重定向 StreamLoad 请求。开启后 StreamLoad 将通过 FE 写入, 不再显式获取 BE 信息。 | ### SQL 和 Dataframe 专有配置 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org