diff --git a/community/source-install/compilation-with-ldb-toolchain.md b/community/source-install/compilation-with-ldb-toolchain.md index b171978b1f12c..629aa5924b8ce 100644 --- a/community/source-install/compilation-with-ldb-toolchain.md +++ b/community/source-install/compilation-with-ldb-toolchain.md @@ -101,7 +101,7 @@ Here, `/path/to/ldb_toolchain/` is the target installation directory. After the | ---- | -------- | -------- | | JDK 8 | 1.8.0_391 | [jdk-8u391-linux-x64.tar.gz](https://doris-thirdparty-1308700295.cos.ap-beijing.myqcloud.com/tools/jdk-8u391-linux-x64.tar.gz) | | JDK 17 | 17.0.10 | [jdk-17.0.10_linux-x64](https://download.oracle.com/java/17/archive/jdk-17.0.10_linux-x64_bin.tar.gz) | -| Maven | 3.9.9 | [apache-maven-3.9.9-bin.tar.gz](https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz) | +| Maven | 3.9.9 | [apache-maven-3.9.9-bin.tar.gz](https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz) | | Node | v12.13.0 | [node-v12.13.0-linux-x64.tar.gz](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-linux-x64.tar.gz) | JDK version selection rules: diff --git a/docs/table-design/data-model/unique.md b/docs/table-design/data-model/unique.md index 56c66c4dc7c97..06f6169902ef2 100644 --- a/docs/table-design/data-model/unique.md +++ b/docs/table-design/data-model/unique.md @@ -35,8 +35,8 @@ The Doris Unique Key Model provides two implementations, compared as follows: | Implementation | Default since version | Merge timing | Query performance | Predicate pushdown | Applicable scenarios | | --- | --- | --- | --- | --- | --- | -| Merge-on-write | Default since 1.2 | Merged immediately at write time | High | Supported | Most scenarios, balancing query and write performance | -| Merge-on-read | Default before 1.2 | Merged at query or compaction time | Lower | Not supported | Write-heavy, read-light scenarios | +| Merge-on-write | Default since 2.1 (introduced in 1.2) | Merged immediately at write time | High | Supported | Most scenarios, balancing query and write performance | +| Merge-on-read | Default before 2.1 | Merged at query or compaction time | Lower | Not supported | Write-heavy, read-light scenarios | - **Merge-on-write**: Records with the same Key are merged immediately at write time, ensuring that the storage always holds the latest data. This mode balances query and write performance, avoids merging data across multiple versions, and supports predicate pushdown to the storage layer. **This mode is recommended for most scenarios.** - **Merge-on-read**: Data is not merged at write time but is appended incrementally, with multiple versions retained inside Doris. At query or compaction time, versions with the same Key are merged. This mode suits write-heavy, read-light scenarios, but queries must merge multiple versions and predicates cannot be pushed down, which may affect query speed. diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/source-install/compilation-with-ldb-toolchain.md b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/source-install/compilation-with-ldb-toolchain.md index cb8653410585a..6f000253efb64 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/source-install/compilation-with-ldb-toolchain.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs-community/current/source-install/compilation-with-ldb-toolchain.md @@ -101,7 +101,7 @@ sh ldb_toolchain_gen.sh /path/to/ldb_toolchain/ | ---- | -------- | -------- | | JDK 8 | 1.8.0_391 | [jdk-8u391-linux-x64.tar.gz](https://doris-thirdparty-1308700295.cos.ap-beijing.myqcloud.com/tools/jdk-8u391-linux-x64.tar.gz) | | JDK 17 | 17.0.10 | [jdk-17.0.10_linux-x64](https://download.oracle.com/java/17/archive/jdk-17.0.10_linux-x64_bin.tar.gz) | -| Maven | 3.9.9 | [apache-maven-3.9.9-bin.tar.gz](https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz) | +| Maven | 3.9.9 | [apache-maven-3.9.9-bin.tar.gz](https://archive.apache.org/dist/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz) | | Node | v12.13.0 | [node-v12.13.0-linux-x64.tar.gz](https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-linux-x64.tar.gz) | JDK 版本选择规则： diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-model/unique.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-model/unique.md index 5cb004df4a809..46e65f3558d24 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-model/unique.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/table-design/data-model/unique.md @@ -28,7 +28,7 @@ 在 Doris 中主键模型有两种实现方式： -* **写时合并**（merge-on-write）：自 1.2 版本起，Doris 默认使用写时合并模式，数据在写入时立即合并相同 Key 的记录，确保存储的始终是最新数据。写时合并兼顾查询和写入性能，避免多个版本的数据合并，并支持谓词下推到存储层。大多数场景推荐使用此模式； +* **写时合并**（merge-on-write）：自 1.2 版本引入，并自 2.1 版本起默认启用写时合并模式，数据在写入时立即合并相同 Key 的记录，确保存储的始终是最新数据。写时合并兼顾查询和写入性能，避免多个版本的数据合并，并支持谓词下推到存储层。大多数场景推荐使用此模式； * **读时合并**（merge-on-read）：在 1.2 版本前，Doris 中的主键模型默认使用读时合并模式，数据在写入时并不进行合并，以增量的方式被追加存储，在 Doris 内保留多个版本。查询或 Compaction 时，会对数据进行相同 Key 的版本合并。读时合并适合写多读少的场景，在查询时需要进行多个版本合并，谓词无法下推，可能会影响到查询速度。 diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/ecosystem/observability/logstash.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/ecosystem/observability/logstash.md index c5f66dd5e26ea..f5f0b5dc20c7d 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/ecosystem/observability/logstash.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/ecosystem/observability/logstash.md @@ -192,7 +192,7 @@ filter { # doris output 将数据输出到 Doris，使用的是 Stream Load HTTP 接口。通过 headers 参数指定了 Stream Load 的数据格式为 JSON，通过 mapping 参数指定 Logstash 字段到 JSON 字段的映射。由于 headers 指定了 "format" => "json"，Stream Load 会自动解析 JSON 字段写入对应的 Doris 表的字段。 output { doris { - http_hosts => ["http://localhost:8630"] + http_hosts => ["http://localhost:8030"] user => "root" password => "" db => "log_db" @@ -372,7 +372,7 @@ input { output { doris { - http_hosts => ["http://fe1:8630", "http://fe2:8630", "http://fe3:8630"] + http_hosts => ["http://fe1:8030", "http://fe2:8030", "http://fe3:8030"] user => "root" password => "" db => "log_db" diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/sql-manual/sql-functions/scalar-functions/date-time-functions/seconds-sub.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/sql-manual/sql-functions/scalar-functions/date-time-functions/seconds-sub.md index 74a648b6b3827..57a3f3a3da4fa 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/sql-manual/sql-functions/scalar-functions/date-time-functions/seconds-sub.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/sql-manual/sql-functions/scalar-functions/date-time-functions/seconds-sub.md @@ -19,7 +19,7 @@ SECONDS_SUB(, ) | 参数 | 说明 | |--------------|---------------------------------------------| | `` | 必填，输入的日期时间值，支持 DATETIME 或 DATE 类型 | -| `` | 必填，要减少或增加的秒数，支持整数类型（INT）。正数表示增加秒数，负数表示减少秒数。 | +| `` | 必填，要减少或增加的秒数，支持整数类型（INT）。正数表示减少秒数，负数表示增加秒数。 | ## 返回值 - 返回一个日期时间值，类型与输入的 `` 类型一致。 diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/table-design/data-model/unique.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/table-design/data-model/unique.md index 87ea02b094a66..c80c985d6b1a5 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/table-design/data-model/unique.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/table-design/data-model/unique.md @@ -28,9 +28,9 @@ 在 Doris 中主键表有两种实现方式： -* **写时合并**（merge-on-write）：自 1.2 版本起，Doris 默认使用写时合并模式，数据在写入时立即合并相同 Key 的记录，确保存储的始终是最新数据。写时合并兼顾查询和写入性能，避免多个版本的数据合并，并支持谓词下推到存储层。大多数场景推荐使用此模式； +* **写时合并**（merge-on-write）：自 1.2 版本引入，并自 2.1 版本起默认启用写时合并模式，数据在写入时立即合并相同 Key 的记录，确保存储的始终是最新数据。写时合并兼顾查询和写入性能，避免多个版本的数据合并，并支持谓词下推到存储层。大多数场景推荐使用此模式； -* **读时合并**（merge-on-read）：在 1.2 版本前，Doris 中的主键表默认使用读时合并模式，数据在写入时并不进行合并，以增量的方式被追加存储，在 Doris 内保留多个版本。查询或 Compaction 时，会对数据进行相同 Key 的版本合并。读时合并适合写多读少的场景，在查询时需要进行多个版本合并，谓词无法下推，可能会影响到查询速度。 +* **读时合并**（merge-on-read）：在 2.1 版本前，Doris 中的主键表默认使用读时合并模式，数据在写入时并不进行合并，以增量的方式被追加存储，在 Doris 内保留多个版本。查询或 Compaction 时，会对数据进行相同 Key 的版本合并。读时合并适合写多读少的场景，在查询时需要进行多个版本合并，谓词无法下推，可能会影响到查询速度。 在 Doris 中基于主键表更新有两种语义： diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-statements/job/CREATE-JOB.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-statements/job/CREATE-JOB.md index 0a22ab2d4cad3..1c9c8c4ad163e 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-statements/job/CREATE-JOB.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-4.x/sql-manual/sql-statements/job/CREATE-JOB.md @@ -130,7 +130,7 @@ interval: - [恢复-JOB](../job/RESUME-JOB.md) - [删除-JOB](../job/DROP-JOB.md) - [查询-JOB](../../../sql-manual/sql-functions/table-valued-functions/jobs.md) -- [查询-TASKS](../../sql-functions/table-valued-functions/jobs.md) +- [查询-TASKS](../../../sql-manual/sql-functions/table-valued-functions/tasks.md) ## CONFIG diff --git a/versioned_docs/version-4.x/table-design/data-model/unique.md b/versioned_docs/version-4.x/table-design/data-model/unique.md index 56c66c4dc7c97..06f6169902ef2 100644 --- a/versioned_docs/version-4.x/table-design/data-model/unique.md +++ b/versioned_docs/version-4.x/table-design/data-model/unique.md @@ -35,8 +35,8 @@ The Doris Unique Key Model provides two implementations, compared as follows: | Implementation | Default since version | Merge timing | Query performance | Predicate pushdown | Applicable scenarios | | --- | --- | --- | --- | --- | --- | -| Merge-on-write | Default since 1.2 | Merged immediately at write time | High | Supported | Most scenarios, balancing query and write performance | -| Merge-on-read | Default before 1.2 | Merged at query or compaction time | Lower | Not supported | Write-heavy, read-light scenarios | +| Merge-on-write | Default since 2.1 (introduced in 1.2) | Merged immediately at write time | High | Supported | Most scenarios, balancing query and write performance | +| Merge-on-read | Default before 2.1 | Merged at query or compaction time | Lower | Not supported | Write-heavy, read-light scenarios | - **Merge-on-write**: Records with the same Key are merged immediately at write time, ensuring that the storage always holds the latest data. This mode balances query and write performance, avoids merging data across multiple versions, and supports predicate pushdown to the storage layer. **This mode is recommended for most scenarios.** - **Merge-on-read**: Data is not merged at write time but is appended incrementally, with multiple versions retained inside Doris. At query or compaction time, versions with the same Key are merged. This mode suits write-heavy, read-light scenarios, but queries must merge multiple versions and predicates cannot be pushed down, which may affect query speed.