You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/06/19 05:31:19 UTC
[doris-website] branch master updated: (release) release doris 1.2.5 (#245)
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/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new a4b0b9f8e4c (release) release doris 1.2.5 (#245)
a4b0b9f8e4c is described below
commit a4b0b9f8e4c4ca1d30887bfc066693a666199f80
Author: Jeffrey <co...@gmail.com>
AuthorDate: Mon Jun 19 13:31:14 2023 +0800
(release) release doris 1.2.5 (#245)
---
.github/workflows/manual-deploy-website.yml | 18 +++-
.gitignore | 6 +-
docusaurus.config.js | 1 -
i18n/zh-CN/code.json | 6 +-
.../version-1.2.json | 4 +-
.../version-1.2/admin-manual/config/fe-config.md | 13 ++-
.../version-1.2/ecosystem/spark-doris-connector.md | 103 ++++++---------------
.../version-1.2/lakehouse/multi-catalog/jdbc.md | 4 +-
.../Create/CREATE-TABLE.md | 2 +-
.../sql-reference/Data-Types/DATETIMEV2.md | 2 +-
i18n/zh-CN/docusaurus-theme-classic/navbar.json | 4 -
local_build_docs.sh | 21 ++++-
src/constant/download.data.ts | 73 +++++++++------
src/pages/download/index.tsx | 12 +--
src/pages/index.tsx | 9 +-
static/images/wechat.png | Bin 26534 -> 9890 bytes
.../version-1.2/admin-manual/config/fe-config.md | 12 ++-
.../version-1.2/ecosystem/spark-doris-connector.md | 98 ++++++--------------
.../version-1.2/lakehouse/multi-catalog/jdbc.md | 4 +-
.../Create/CREATE-TABLE.md | 2 +-
versioned_sidebars/version-1.2-sidebars.json | 3 +-
21 files changed, 184 insertions(+), 213 deletions(-)
diff --git a/.github/workflows/manual-deploy-website.yml b/.github/workflows/manual-deploy-website.yml
index be0caa3f788..135046d661f 100644
--- a/.github/workflows/manual-deploy-website.yml
+++ b/.github/workflows/manual-deploy-website.yml
@@ -38,7 +38,8 @@ jobs:
- name: Build
run: |
- git clone https://github.com/apache/doris.git
+ # clone docs version dev
+ git clone --branch master https://github.com/apache/doris.git --depth 1
mkdir -p docs
cp -R doris/docs/en/docs/* docs/
cp -R doris/docs/sidebars.json sidebars.json
@@ -52,7 +53,22 @@ jobs:
cp -R doris/docs/zh-CN/community/* i18n/zh-CN/docusaurus-plugin-content-docs-community/current/
cp -R doris/docs/sidebarsCommunity.json .
+ # clone images
cp -R doris/docs/images static/
+
+ rm -rf doris
+
+ # clone docs version 1.2
+ git clone --branch branch-1.2-lts https://github.com/apache/doris.git --depth 1
+ mkdir -p docs
+ mkdir -p versioned_docs/version-1.2
+ cp -R doris/docs/en/docs/* versioned_docs/version-1.2/
+ rm -rf versioned_sidebars/version-1.2-sidebars.json
+ cp -R doris/docs/sidebars.json versioned_sidebars/version-1.2-sidebars.json
+ mkdir -p i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2
+ cp -R doris/docs/zh-CN/docs/* i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/
+ cp -R doris/docs/dev.json i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json
+
npm install -g yarn
yarn cache clean
yarn && yarn build
diff --git a/.gitignore b/.gitignore
index ccc9234be7d..53196cc785c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,8 @@ yarn.lock
sidebars.json
sidebarsCommunity.json
-i18n/zh-CN/docusaurus-plugin-content-docs/current
-i18n/zh-CN/docusaurus-plugin-content-docs/current.json
+i18n/zh-CN/docusaurus-plugin-content-docs
i18n/zh-CN/docusaurus-plugin-content-docs-community/current
docs/
-community/
\ No newline at end of file
+community/
+versioned_docs
\ No newline at end of file
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 3c2b3ebb90a..9a7c3727a0c 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -203,7 +203,6 @@ const config = {
docsPluginId: 'community',
},
{ to: '/users', label: 'Users', position: 'left' },
- { to: 'https://github.com/apache/doris/issues/16392', label: 'Roadmap', position: 'left' },
{
type: 'docsVersionDropdown',
position: 'right',
diff --git a/i18n/zh-CN/code.json b/i18n/zh-CN/code.json
index c1c974627df..ad27eb52fc0 100644
--- a/i18n/zh-CN/code.json
+++ b/i18n/zh-CN/code.json
@@ -768,9 +768,9 @@
"download.quick.download.notice": {
"message": "1.2.1 版本暂不支持使用 JDK11 运行，会在后续版本修复。"
},
- "1.2.4.1": {
- "message": "Apache Doris 1.2.4.1 Release",
- "description": "Apache Doris 1.2.4.1 Release"
+ "1.2.5": {
+ "message": "Apache Doris 1.2.5 Release",
+ "description": "Apache Doris 1.2.5 Release"
},
"download.document": {
"message": "Document",
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json
index ce1df43c419..6f82a5eadf4 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json
@@ -1,6 +1,6 @@
{
"version.label": {
- "message": "1.2",
+ "message": "dev",
"description": "The label for version current"
},
"sidebar.docs.category.Getting Started": {
@@ -307,4 +307,4 @@
"message": "外部表",
"description": "The label for category Lakehouse.External Table in sidebar docs"
}
-}
\ No newline at end of file
+}
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/admin-manual/config/fe-config.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/admin-manual/config/fe-config.md
index 99b97544bd5..8f79e7f414c 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/admin-manual/config/fe-config.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/admin-manual/config/fe-config.md
@@ -47,7 +47,7 @@ FE 的配置项有两种方式进行查看：
2. 通过命令查看
- FE 启动后，可以在 MySQL 客户端中，通过以下命令查看 FE 的配置项：
+ FE 启动后，可以在 MySQL 客户端中，通过以下命令查看 FE 的配置项，具体语法参考[ADMIN-SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md)：
`ADMIN SHOW FRONTEND CONFIG;`
@@ -1969,6 +1969,16 @@ BE副本数的平衡阈值。
2. 因为一旦关闭平衡，不稳定的 colocate 表可能无法恢复
3. 最终查询时无法使用 colocate 计划。
+#### `balance_slot_num_per_path`
+
+默认值：1
+
+是否可以动态配置：true
+
+是否为 Master FE 节点独有的配置项：true
+
+balance 时每个路径的默认 slot 数量
+
#### `disable_tablet_scheduler`
默认值：false
@@ -2703,3 +2713,4 @@ show data （其他用法：HELP SHOW DATA）
当设置为 false 时，查询 `information_schema` 中的表时，将不再返回 external catalog 中的表的信息。
这个参数主要用于避免因 external catalog 无法访问、信息过多等原因导致的查询 `information_schema` 超时的问题。
+
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/ecosystem/spark-doris-connector.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/ecosystem/spark-doris-connector.md
index 6c0b8a5c176..702dc343abc 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/ecosystem/spark-doris-connector.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/ecosystem/spark-doris-connector.md
@@ -1,7 +1,7 @@
---
{
- "title": "Spark Doris Connector",
- "language": "zh-CN"
+ "title": "Spark Doris Connector",
+ "language": "zh-CN"
}
---
@@ -28,7 +28,7 @@ under the License.
Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据，也支持通过Spark写入数据到Doris。
-代码库地址：https://github.com/apache/incubator-doris-spark-connector
+代码库地址：https://github.com/apache/doris-spark-connector
- 支持从`Doris`中读取数据
- 支持`Spark DataFrame`批量/流式 写入`Doris`
@@ -37,94 +37,49 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据
## 版本兼容
-| Connector | Spark | Doris | Java | Scala |
-|---------------| ----- | ------ | ---- | ----- |
-| 2.3.4-2.11.xx | 2.x | 0.12+ | 8 | 2.11 |
-| 3.1.2-2.12.xx | 3.x | 0.12.+ | 8 | 2.12 |
-| 3.2.0-2.12.xx | 3.2.x | 0.12.+ | 8 | 2.12 |
+| Connector | Spark | Doris | Java | Scala |
+| --------- | ------------- |-------------| ---- | ---------- |
+| 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 |
## 编译与安装
准备工作
-1.修改`custom_env.sh.tpl`文件，重命名为`custom_env.sh`
-
-2.指定thrift安装目录
-
-```bash
-##源文件内容
-#export THRIFT_BIN=
-#export MVN_BIN=
-#export JAVA_HOME=
-
-##修改如下,MacOS为例
-export THRIFT_BIN=/opt/homebrew/Cellar/thrift@0.13.0/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.修改thrift-0.13.0.exe 为 thrift
-
- MacOS:
- 1. 下载：`brew install thrift@0.13.0`
- 2. 默认下载地址：/opt/homebrew/Cellar/thrift@0.13.0/0.13.0/bin/thrift
-
-
- 注：MacOS执行 `brew install thrift@0.13.0` 可能会报找不到版本的错误，解决方法如下，在终端执行：
- 1. `brew tap-new $USER/local-tap`
- 2. `brew extract --version='0.13.0' thrift $USER/local-tap`
- 3. `brew install thrift@0.13.0`
- 参考链接: `https://gist.github.com/tonydeng/02e571f273d6cce4230dc8d5f394493c`
-
- Linux:
- 1.下载源码包：`wget https://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz`
- 2.安装依赖：`yum install -y autoconf automake libtool cmake ncurses-devel openssl-devel lzo-devel zlib-devel gcc gcc-c++`
- 3.`tar zxvf thrift-0.13.0.tar.gz`
- 4.`cd thrift-0.13.0`
- 5.`./configure --without-tests`
- 6.`make`
- 7.`make install`
- 安装完成后查看版本：thrift --version
- 注：如果编译过Doris，则不需要安装thrift,可以直接使用 $DORIS_HOME/thirdparty/installed/bin/thrift
-```
+1. 修改`custom_env.sh.tpl`文件，重命名为`custom_env.sh`
-在源码目录下执行：
+2. 在源码目录下执行：
+ `sh build.sh`
+ 根据提示输入你需要的 Scala 与 Spark 版本进行编译。
-```bash
-sh build.sh --spark 2.3.4 --scala 2.11 ## spark 2.3.4, scala 2.11
-sh build.sh --spark 3.1.2 --scala 2.12 ## spark 3.1.2, scala 2.12
-sh build.sh --spark 3.2.0 --scala 2.12 \
---mvn-args "-Dnetty.version=4.1.68.Final -Dfasterxml.jackson.version=2.12.3" ## spark 3.2.0, scala 2.12
-```
-> 注：如果你是从 tag 检出的源码，则可以直接执行 `sh build.sh --tag`，而无需指定 spark 和 scala 的版本。因为 tag 源码中的版本是固定的。
+编译成功后，会在 `dist` 目录生成目标jar包，如：`spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar`。
+将此文件复制到 `Spark` 的 `ClassPath` 中即可使用 `Spark-Doris-Connector`。
-编译成功后，会在 `output/` 目录下生成文件 `doris-spark-2.3.4-2.11-1.0.0-SNAPSHOT.jar`。将此文件复制到 `Spark` 的 `ClassPath` 中即可使用 `Spark-Doris-Connector`。例如，`Local` 模式运行的 `Spark`，将此文件放入 `jars/` 文件夹下。`Yarn`集群模式运行的`Spark`，则将此文件放入预部署包中。
+例如，`Local` 模式运行的 `Spark`，将此文件放入 `jars/` 文件夹下。`Yarn`集群模式运行的`Spark`，则将此文件放入预部署包中。
-例如将 `doris-spark-2.3.4-2.11-1.0.0-SNAPSHOT.jar` 上传到 hdfs并在spark.yarn.jars参数上添加 hdfs上的Jar包路径
+例如将 `spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar` 上传到 hdfs 并在 `spark.yarn.jars` 参数上添加 hdfs 上的 Jar 包路径
-1. 上传doris-spark-connector-3.1.2-2.12-1.0.0.jar 到hdfs。
+1. 上传 `spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar` 到hdfs。
```
hdfs dfs -mkdir /spark-jars/
-hdfs dfs -put /your_local_path/doris-spark-connector-3.1.2-2.12-1.0.0.jar /spark-jars/
+hdfs dfs -put /your_local_path/spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar /spark-jars/
```
-2. 在集群中添加doris-spark-connector-3.1.2-2.12-1.0.0.jar 依赖。
+2. 在集群中添加 `spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar` 依赖。
```
-spark.yarn.jars=hdfs:///spark-jars/doris-spark-connector-3.1.2-2.12-1.0.0.jar
+spark.yarn.jars=hdfs:///spark-jars/spark-doris-connector-3.2_2.12-1.2.0-SNAPSHOT.jar
```
## 使用Maven管理
```
<dependency>
- <groupId>org.apache.doris</groupId>
- <artifactId>spark-doris-connector-3.1_2.12</artifactId>
- <!--artifactId>spark-doris-connector-2.3_2.11</artifactId-->
- <version>1.0.1</version>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>spark-doris-connector-3.2_2.12</artifactId>
+ <version>1.2.0</version>
</dependency>
```
@@ -155,7 +110,7 @@ SELECT * FROM spark_doris;
```scala
val dorisSparkDF = spark.read.format("doris")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
.load()
@@ -188,12 +143,10 @@ dorisSparkDF = spark.read.format("doris")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
.load()
-# show 5 lines data
+// show 5 lines data
dorisSparkDF.show(5)
```
-
-
### 写入
#### SQL
@@ -226,7 +179,7 @@ mockDataDF.show(5)
mockDataDF.write.format("doris")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
//其它选项
@@ -246,7 +199,7 @@ kafkaSource.selectExpr("CAST(key AS STRING)", "CAST(value as STRING)")
.format("doris")
.option("checkpointLocation", "$YOUR_CHECKPOINT_LOCATION")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
//其它选项
@@ -256,7 +209,7 @@ kafkaSource.selectExpr("CAST(key AS STRING)", "CAST(value as STRING)")
.awaitTermination()
```
-### java示例
+### Java示例
`samples/doris-demo/spark-demo/` 下提供了 Java 版本的示例，可供参考，[这里](https://github.com/apache/incubator-doris/tree/master/samples/doris-demo/spark-demo)
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/lakehouse/multi-catalog/jdbc.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/lakehouse/multi-catalog/jdbc.md
index 78292960ff1..b8f52431a5d 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/lakehouse/multi-catalog/jdbc.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/lakehouse/multi-catalog/jdbc.md
@@ -375,7 +375,9 @@ set enable_odbc_transcation = true;
| int | INT | |
| bigint | BIGINT | |
| real | FLOAT | |
-| float/money/smallmoney | DOUBLE | |
+| float | DOUBLE | |
+| money | DECIMAL(19,4) | |
+| smallmoney | DECIMAL(10,4) | |
| decimal/numeric | DECIMAL | |
| date | DATE | |
| datetime/datetime2/smalldatetime | DATETIMEV2 | |
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
index f009943eac0..d4da172a9cf 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
@@ -346,7 +346,7 @@ distribution_desc
`"light_schema_change" = 'true'`
- 该功能在 1.2.1 及之后版本默认开启。
+ 该功能在 2.0.0 及之后版本默认开启。
* `disable_auto_compaction`
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Types/DATETIMEV2.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Types/DATETIMEV2.md
index 097989c65e7..62404483f34 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Types/DATETIMEV2.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/sql-manual/sql-reference/Data-Types/DATETIMEV2.md
@@ -28,7 +28,7 @@ under the License.
<version since="1.2.0">
-DATATIMEV2
+DATETIMEV2
</version>
diff --git a/i18n/zh-CN/docusaurus-theme-classic/navbar.json b/i18n/zh-CN/docusaurus-theme-classic/navbar.json
index f1d519b10c5..950d285e293 100644
--- a/i18n/zh-CN/docusaurus-theme-classic/navbar.json
+++ b/i18n/zh-CN/docusaurus-theme-classic/navbar.json
@@ -26,9 +26,5 @@
"item.label.Home": {
"message": "首页",
"description": "Navbar item with label Home"
- },
- "item.label.Roadmap": {
- "message": "Roadmap",
- "description": "Navbar item with label Roadmap"
}
}
diff --git a/local_build_docs.sh b/local_build_docs.sh
index d5aeff45258..9dcfc497df5 100644
--- a/local_build_docs.sh
+++ b/local_build_docs.sh
@@ -26,7 +26,9 @@
set -eo pipefail
-git clone https://github.com/apache/doris.git --depth 1
+rm -rf doris
+
+git clone --branch master https://github.com/apache/doris.git --depth 1
mkdir -p docs
cp -R doris/docs/en/docs/* docs/
cp -R doris/docs/sidebars.json sidebars.json
@@ -40,7 +42,24 @@ mkdir -p i18n/zh-CN/docusaurus-plugin-content-docs-community/current/
cp -R doris/docs/zh-CN/community/* i18n/zh-CN/docusaurus-plugin-content-docs-community/current/
cp -R doris/docs/sidebarsCommunity.json .
+# clone images
cp -R doris/docs/images static/
+
+rm -rf doris
+
+# clone docs version 1.2
+git clone --branch branch-1.2-lts https://github.com/apache/doris.git --depth 1
+mkdir -p docs
+mkdir -p versioned_docs/version-1.2
+cp -R doris/docs/en/docs/* versioned_docs/version-1.2/
+rm -rf versioned_sidebars/version-1.2-sidebars.json
+cp -R doris/docs/sidebars.json versioned_sidebars/version-1.2-sidebars.json
+mkdir -p i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2
+cp -R doris/docs/zh-CN/docs/* i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2/
+cp -R doris/docs/dev.json i18n/zh-CN/docusaurus-plugin-content-docs/version-1.2.json
+
+rm -rf doris
+
npm install -g yarn
yarn cache clean
yarn && yarn build
diff --git a/src/constant/download.data.ts b/src/constant/download.data.ts
index 4e867d1a9a2..ab3cb64672a 100644
--- a/src/constant/download.data.ts
+++ b/src/constant/download.data.ts
@@ -56,64 +56,64 @@ export function getAllDownloadLinks(locale: string) {
],
},
{
- id: '1.2.4.1-intel-avx2-jdk8',
+ id: '1.2.5-intel-avx2-jdk8',
sh: {
- label: 'apache-doris-1.2.4.1-bin-x86_64.tar.xz',
+ label: 'apache-doris-1.2.5-bin-x86_64.tar.xz',
links: {
- source: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64.tar.xz`,
- signature: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64.tar.xz.asc`,
- sha512: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64.tar.xz.sha512`,
+ source: `${ORIGIN}apache-doris-1.2.5-bin-x86_64.tar.xz`,
+ signature: `${ORIGIN}apache-doris-1.2.5-bin-x86_64.tar.xz.asc`,
+ sha512: `${ORIGIN}apache-doris-1.2.5-bin-x86_64.tar.xz.sha512`,
},
},
items: [
{
- label: 'apache-doris-1.2.4.1-src.tar.gz',
+ label: 'apache-doris-1.2.5-src.tar.gz',
links: {
- source: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz`,
- signature: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.asc`,
- sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.sha512`,
+ source: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz`,
+ signature: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.asc`,
+ sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.sha512`,
},
},
],
},
{
- id: '1.2.4.1-intel-noavx2-jdk8',
+ id: '1.2.5-intel-noavx2-jdk8',
sh: {
- label: 'apache-doris-1.2.4.1-bin-x86_64-noavx2.tar.xz',
+ label: 'apache-doris-1.2.5-bin-x86_64-noavx2.tar.xz',
links: {
- source: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64-noavx2.tar.xz`,
- signature: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64-noavx2.tar.xz.asc`,
- sha512: `${ORIGIN}apache-doris-1.2.4.1-bin-x86_64-noavx2.tar.xz.sha512`,
+ source: `${ORIGIN}apache-doris-1.2.5-bin-x86_64-noavx2.tar.xz`,
+ signature: `${ORIGIN}apache-doris-1.2.5-bin-x86_64-noavx2.tar.xz.asc`,
+ sha512: `${ORIGIN}apache-doris-1.2.5-bin-x86_64-noavx2.tar.xz.sha512`,
},
},
items: [
{
- label: 'apache-doris-1.2.4.1-src.tar.gz',
+ label: 'apache-doris-1.2.5-src.tar.gz',
links: {
- source: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz`,
- signature: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.asc`,
- sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.sha512`,
+ source: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz`,
+ signature: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.asc`,
+ sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.sha512`,
},
},
],
},
{
- id: '1.2.4.1-arm-jdk8',
+ id: '1.2.5-arm-jdk8',
sh: {
- label: 'apache-doris-1.2.4.1-bin-arm.tar.xz',
+ label: 'apache-doris-1.2.5-bin-arm.tar.xz',
links: {
- source: `${ORIGIN}apache-doris-1.2.4.1-bin-aarch64.tar.xz`,
- signature: `${ORIGIN}apache-doris-1.2.4.1-bin-aarch64.tar.xz.asc`,
- sha512: `${ORIGIN}apache-doris-1.2.4.1-bin-aarch64.tar.xz.sha512`,
+ source: `${ORIGIN}apache-doris-1.2.5-bin-aarch64.tar.xz`,
+ signature: `${ORIGIN}apache-doris-1.2.5-bin-aarch64.tar.xz.asc`,
+ sha512: `${ORIGIN}apache-doris-1.2.5-bin-aarch64.tar.xz.sha512`,
},
},
items: [
{
- label: 'apache-doris-1.2.4.1-src.tar.gz',
+ label: 'apache-doris-1.2.5-src.tar.gz',
links: {
- source: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz`,
- signature: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.asc`,
- sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.4.1-rc01/apache-doris-1.2.4.1-src.tar.gz.sha512`,
+ source: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz`,
+ signature: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.asc`,
+ sha512: `${APACHE_ARCHIVE}doris/1.2/1.2.5-rc01/apache-doris-1.2.5-src.tar.gz.sha512`,
},
},
],
@@ -275,6 +275,15 @@ export function getAllDownloadLinks(locale: string) {
export function getAllFlinkConnectorDownloadLinks(locale: string) {
const sources = locale.toLocaleUpperCase() === 'EN' ? FLINK_CONNECTOR_LINK : CHINA_FLINK_CONNECTOR_MIRROR_LINK;
return [
+ {
+ version: '1.4.0',
+ date: '2023-06-16',
+ flink: '1.17',
+ scala: '2.12, 2.11',
+ doris: '1.0+',
+ download: `${sources}doris/flink-connector/1.4.0/`,
+ github: 'https://github.com/apache/doris-flink-connector',
+ },
{
version: '1.3.0',
date: '2022-12-07',
@@ -365,7 +374,13 @@ export function getAllRelease(locale: string) {
download: `${sources}doris/2.0/2.0.0-alpha1/`,
},
{
- version: '1.2.4.1 (Stable)',
+ version: '1.2.5 (Stable)',
+ date: '2023-06-18',
+ note: '/docs/dev/releasenotes/release-1.2.5',
+ download: `${sources}doris/1.2/1.2.5-rc01/`,
+ },
+ {
+ version: '1.2.4.1',
date: '2023-04-27',
note: '/docs/dev/releasenotes/release-1.2.4.1',
download: `${sources}doris/1.2/1.2.4.1-rc01/`,
@@ -447,7 +462,7 @@ export function getAllRelease(locale: string) {
export enum VersionEnum {
Latest = '2.0.0-alpha1',
- Prev = '1.2.4.1',
+ Prev = '1.2.5',
Earlier = '1.1.5',
}
diff --git a/src/pages/download/index.tsx b/src/pages/download/index.tsx
index d8c1191244c..64d00bc78eb 100644
--- a/src/pages/download/index.tsx
+++ b/src/pages/download/index.tsx
@@ -20,8 +20,8 @@ import {
} from '@site/src/constant/download.data';
const BINARY_VERSION = [
- { label: `${VersionEnum.Latest} ( latest )`, value: VersionEnum.Latest },
- { label: `${VersionEnum.Prev} （Stable)`, value: VersionEnum.Prev },
+ { label: `${VersionEnum.Latest} (Latest)`, value: VersionEnum.Latest },
+ { label: `${VersionEnum.Prev} (Stable)`, value: VersionEnum.Prev },
{ label: VersionEnum.Earlier, value: VersionEnum.Earlier },
];
@@ -212,11 +212,7 @@ export default function Download(): JSX.Element {
checked: downloadWay === 'all-in-one',
})}
>
- <span>
- {currentLocale === 'zh-CN'
- ? '二进制下载 （推荐）'
- : 'Binary Download (Recommended)'}
- </span>
+ <span>{currentLocale === 'zh-CN' ? '二进制' : 'Binary'}</span>
</div>
<div
@@ -225,7 +221,7 @@ export default function Download(): JSX.Element {
checked: downloadWay === 'download',
})}
>
- <span>{currentLocale === 'zh-CN' ? '源码下载' : 'Download'}</span>
+ <span>{currentLocale === 'zh-CN' ? '源码' : 'Source'}</span>
</div>
</div>
</div>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 136cade482c..a92efbe12fc 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -152,12 +152,9 @@ export default function Home(): JSX.Element {
<div className="news-wrap">
<div className="news-item">
<span className="news-icon"></span>
- <Link
- to="https://github.com/apache/doris/releases/tag/1.2.4.1-rc01"
- className="news-content"
- >
- <Translate id="1.2.4.1" description="Apache Doris 1.2.4.1 Release">
- Apache Doris 1.2.4.1 Release
+ <Link to="/docs/dev/releasenotes/release-1.2.5" className="news-content">
+ <Translate id="1.2.5" description="Apache Doris 1.2.5 Release">
+ Apache Doris 1.2.5 Release
</Translate>
</Link>
</div>
diff --git a/static/images/wechat.png b/static/images/wechat.png
index f4d0f7ac8a6..421b4a6a6c6 100644
Binary files a/static/images/wechat.png and b/static/images/wechat.png differ
diff --git a/versioned_docs/version-1.2/admin-manual/config/fe-config.md b/versioned_docs/version-1.2/admin-manual/config/fe-config.md
index bc3acae538c..6cb36cdb8c4 100644
--- a/versioned_docs/version-1.2/admin-manual/config/fe-config.md
+++ b/versioned_docs/version-1.2/admin-manual/config/fe-config.md
@@ -48,7 +48,7 @@ There are two ways to view the configuration items of FE:
2. View by command
- After the FE is started, you can view the configuration items of the FE in the MySQL client with the following command:
+ After the FE is started, you can view the configuration items of the FE in the MySQL client with the following command,Concrete language law reference [ADMIN-SHOW-CONFIG](../../sql-manual/sql-reference/Database-Administration-Statements/ADMIN-SHOW-CONFIG.md):
`ADMIN SHOW FRONTEND CONFIG;`
@@ -1965,6 +1965,16 @@ This configs can set to true to disable the automatic colocate tables's relocate
2. Because once the balance is turned off, the unstable colocate table may not be restored
3. Eventually the colocate plan cannot be used when querying.
+#### `balance_slot_num_per_path`
+
+Default: 1
+
+IsMutable：true
+
+MasterOnly：true
+
+Default number of slots per path during balance.
+
#### `disable_tablet_scheduler`
Default:false
diff --git a/versioned_docs/version-1.2/ecosystem/spark-doris-connector.md b/versioned_docs/version-1.2/ecosystem/spark-doris-connector.md
index 56d403f2e73..b39d8ff6781 100644
--- a/versioned_docs/version-1.2/ecosystem/spark-doris-connector.md
+++ b/versioned_docs/version-1.2/ecosystem/spark-doris-connector.md
@@ -1,7 +1,7 @@
---
{
- "title": "Spark Doris Connector",
- "language": "en"
+ "title": "Spark Doris Connector",
+ "language": "en"
}
---
@@ -28,7 +28,7 @@ under the License.
Spark Doris Connector can support reading data stored in Doris and writing data to Doris through Spark.
-Github: https://github.com/apache/incubator-doris-spark-connector
+Github: https://github.com/apache/doris-spark-connector
- Support reading data from `Doris`.
- Support `Spark DataFrame` batch/stream writing data to `Doris`
@@ -37,94 +37,48 @@ Github: https://github.com/apache/incubator-doris-spark-connector
## Version Compatibility
-| Connector | Spark | Doris | Java | Scala |
-|---------------| ----- | ------ | ---- | ----- |
-| 2.3.4-2.11.xx | 2.x | 0.12+ | 8 | 2.11 |
-| 3.1.2-2.12.xx | 3.x | 0.12.+ | 8 | 2.12 |
-| 3.2.0-2.12.xx | 3.2.x | 0.12.+ | 8 | 2.12 |
+| Connector | Spark | Doris | Java | Scala |
+| --------- | ------------- |-------------| ---- | ---------- |
+| 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 |
## Build and Install
Ready to work
-1.Modify the `custom_env.sh.tpl` file and rename it to `custom_env.sh`
-
-2.Specify the thrift installation directory
-
-```bash
-##source file content
-#export THRIFT_BIN=
-#export MVN_BIN=
-#export JAVA_HOME=
-
-##amend as below,MacOS as an example
-export THRIFT_BIN=/opt/homebrew/Cellar/thrift@0.13.0/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. Modify thrift-0.13.0.exe to thrift
-
-MacOS:
- 1. Download: `brew install thrift@0.13.0`
- 2. default address: /opt/homebrew/Cellar/thrift@0.13.0/0.13.0/bin/thrift
-
-Note: Executing `brew install thrift@0.13.0` 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`
- 2. `brew extract --version='0.13.0' thrift $USER/local-tap`
- 3. `brew install thrift@0.13.0`
- Reference link: `https://gist.github.com/tonydeng/02e571f273d6cce4230dc8d5f394493c`
-
-Linux:
- 1.Download source package：`wget https://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz`
- 2.Install dependencies：`yum install -y autoconf automake libtool cmake ncurses-devel openssl-devel lzo-devel zlib-devel gcc gcc-c++`
- 3.`tar zxvf thrift-0.13.0.tar.gz`
- 4.`cd thrift-0.13.0`
- 5.`./configure --without-tests`
- 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
-```
+1. Modify the `custom_env.sh.tpl` file and rename it to `custom_env.sh`
-Execute following command in source dir
+2. Execute following command in source dir:
+ `sh build.sh`
+ Follow the prompts to enter the Scala and Spark versions you need to start compiling.
-```bash
-sh build.sh --spark 2.3.4 --scala 2.11 ## spark 2.3.4, scala 2.11
-sh build.sh --spark 3.1.2 --scala 2.12 ## spark 3.1.2, scala 2.12
-sh build.sh --spark 3.2.0 --scala 2.12 \
---mvn-args "-Dnetty.version=4.1.68.Final -Dfasterxml.jackson.version=2.12.3" ## spark 3.2.0, scala 2.12
-```
-> Note: If you check out the source code from tag, you can just run sh build.sh --tag without specifying the spark and scala versions. This is because the version in the tag source code is fixed.
+After the compilation is successful, the target jar package will be generated in the `dist` directory, such as: `spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar`.
+Copy this file to `ClassPath` in `Spark` to use `Spark-Doris-Connector`. For example, `Spark` running in `Local` mode, put this file in the `jars/` folder. `Spark` running in `Yarn` cluster mode, put this file in the pre-deployment package.
-After successful compilation, the file `doris-spark-2.3.4-2.11-1.0.0-SNAPSHOT.jar` will be generated in the `output/` directory. Copy this file to `ClassPath` in `Spark` to use `Spark-Doris-Connector`. For example, `Spark` running in `Local` mode, put this file in the `jars/` folder. `Spark` running in `Yarn` cluster mode, put this file in the pre-deployment package ,for example upload `doris-spark-2.3.4-2.11-1.0.0-SNAPSHOT.jar` to hdfs and add hdfs file path in spark.yarn.jars.
+For example upload `spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar` to hdfs and add hdfs file path in spark.yarn.jars.
-1. Upload doris-spark-connector-3.1.2-2.12-1.0.0.jar Jar to hdfs.
+1. Upload `spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar` Jar to hdfs.
```
hdfs dfs -mkdir /spark-jars/
-hdfs dfs -put /your_local_path/doris-spark-connector-3.1.2-2.12-1.0.0.jar /spark-jars/
-
+hdfs dfs -put /your_local_path/spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar /spark-jars/
```
-2. Add doris-spark-connector-3.1.2-2.12-1.0.0.jar depence in Cluster.
+2. Add `spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar` dependency in Cluster.
```
-spark.yarn.jars=hdfs:///spark-jars/doris-spark-connector-3.1.2-2.12-1.0.0.jar
+spark.yarn.jars=hdfs:///spark-jars/spark-doris-connector-3.1_2.12-1.2.0-SNAPSHOT.jar
```
-
## Using Maven
```
<dependency>
- <groupId>org.apache.doris</groupId>
- <artifactId>spark-doris-connector-3.1_2.12</artifactId>
- <!--artifactId>spark-doris-connector-2.3_2.11</artifactId-->
- <version>1.0.1</version>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>spark-doris-connector-3.1_2.12</artifactId>
+ <version>1.2.0</version>
</dependency>
```
@@ -155,7 +109,7 @@ SELECT * FROM spark_doris;
```scala
val dorisSparkDF = spark.read.format("doris")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
.load()
@@ -187,7 +141,7 @@ dorisSparkDF = spark.read.format("doris")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
.load()
-# show 5 lines data
+// show 5 lines data
dorisSparkDF.show(5)
```
@@ -222,7 +176,7 @@ mockDataDF.show(5)
mockDataDF.write.format("doris")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
//other options
@@ -242,7 +196,7 @@ kafkaSource.selectExpr("CAST(key AS STRING)", "CAST(value as STRING)")
.format("doris")
.option("checkpointLocation", "$YOUR_CHECKPOINT_LOCATION")
.option("doris.table.identifier", "$YOUR_DORIS_DATABASE_NAME.$YOUR_DORIS_TABLE_NAME")
- .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
+ .option("doris.fenodes", "$YOUR_DORIS_FE_HOSTNAME:$YOUR_DORIS_FE_RESFUL_PORT")
.option("user", "$YOUR_DORIS_USERNAME")
.option("password", "$YOUR_DORIS_PASSWORD")
//other options
diff --git a/versioned_docs/version-1.2/lakehouse/multi-catalog/jdbc.md b/versioned_docs/version-1.2/lakehouse/multi-catalog/jdbc.md
index 3c2606194f6..4b7a73d8eb3 100644
--- a/versioned_docs/version-1.2/lakehouse/multi-catalog/jdbc.md
+++ b/versioned_docs/version-1.2/lakehouse/multi-catalog/jdbc.md
@@ -376,7 +376,9 @@ The transaction mechanism ensures the atomicity of data writing to JDBC External
| int | INT | |
| bigint | BIGINT | |
| real | FLOAT | |
-| float/money/smallmoney | DOUBLE | |
+| float | DOUBLE | |
+| money | DECIMAL(19,4) | |
+| smallmoney | DECIMAL(10,4) | |
| decimal/numeric | DECIMAL | |
| date | DATE | |
| datetime/datetime2/smalldatetime | DATETIMEV2 | |
diff --git a/versioned_docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md b/versioned_docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
index 61aba7492da..9866ba41b85 100644
--- a/versioned_docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
+++ b/versioned_docs/version-1.2/sql-manual/sql-reference/Data-Definition-Statements/Create/CREATE-TABLE.md
@@ -349,7 +349,7 @@ distribution_desc
`"light_schema_change"="true"`
- This feature is enabled by default after v1.2.1.
+ This feature is enabled by default after v2.0.0.
* `disable_auto_compaction`
diff --git a/versioned_sidebars/version-1.2-sidebars.json b/versioned_sidebars/version-1.2-sidebars.json
index 74ea027035a..c543983e053 100644
--- a/versioned_sidebars/version-1.2-sidebars.json
+++ b/versioned_sidebars/version-1.2-sidebars.json
@@ -1047,7 +1047,8 @@
"items": [
"admin-manual/cluster-management/upgrade",
"admin-manual/cluster-management/elastic-expansion",
- "admin-manual/cluster-management/load-balancing"
+ "admin-manual/cluster-management/load-balancing",
+ "admin-manual/cluster-management/fqdn"
]
},
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org