This is an automated email from the ASF dual-hosted git repository.
kassiez 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 f6d7e1aa3ab Add atomic_restore and force_restore for RESTORE stmt
(#1961)
f6d7e1aa3ab is described below
commit f6d7e1aa3abe7ebe6bc8a4e5d0dd6c6029087b9f
Author: Uniqueyou <wangyix...@selectdb.com>
AuthorDate: Fri Mar 28 15:47:41 2025 +0800
Add atomic_restore and force_restore for RESTORE stmt (#1961)
## Versions
https://github.com/apache/doris/pull/47314
- [x] dev
- [x] 3.0
- [x] 2.1
- [ ] 2.0
## Languages
- [x] Chinese
- [x] English
## Docs Checklist
- [ ] Checked by AI
- [ ] Test Cases Built
---
.../data-modification/backup-and-restore/RESTORE.md | 7 +++++--
.../data-modification/backup-and-restore/RESTORE.md | 5 +++++
.../data-modification/backup-and-restore/RESTORE.md | 5 +++++
.../data-modification/backup-and-restore/RESTORE.md | 6 ++++++
.../data-modification/backup-and-restore/RESTORE.md | 10 ++++++----
.../data-modification/backup-and-restore/RESTORE.md | 10 ++++++----
6 files changed, 33 insertions(+), 10 deletions(-)
diff --git
a/docs/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/docs/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index a00c52913ff..c58987b871b 100644
---
a/docs/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/docs/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -66,9 +66,12 @@ Restoration operation attributes, the format is `<key>` =
`<value>`，currently
- "timeout" = "3600": The task timeout period, the default is one day. in
seconds.
- "meta_version" = 40: Use the specified meta_version to read the previously
backed up metadata. Note that this parameter is used as a temporary solution
and is only used to restore the data backed up by the old version of Doris. The
latest version of the backup data already contains the meta version, no need to
specify it.
- "clean_tables" : Indicates whether to clean up tables that do not belong to
the restore target. For example, if the target db before the restore has tables
that are not present in the snapshot, specifying `clean_tables` can drop these
extra tables and move them into the recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
+ - This feature is supported since the Apache Doris 2.1.6 version
- "clean_partitions": Indicates whether to clean up partitions that do not
belong to the restore target. For example, if the target table before the
restore has partitions that are not present in the snapshot, specifying
`clean_partitions` can drop these extra partitions and move them into the
recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
+ - This feature is supported since the Apache Doris 2.1.6 version
+- "atomic_restore" - : The data will be loaded into a temporary table first,
and then the original table will be replaced atomically to ensure that the read
and write of the target table are not affected during the recovery process.
+- "force_replace" : Force replace when the table exists and the schema is
different with the backup table.
+ - Note that to enable `force_replace`, you must enable `atomic_restore`
## Optional Parameters
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index 136baedd452..2f189e2bb09 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -65,6 +65,11 @@ FROM `<repository_name>`
- "reserve_dynamic_partition_enable" = "true"：默认为 false。当该属性为 true
时，恢复的表会保留该表备份之前的'dynamic_partition_enable'属性值。该值不为 true
时，则恢复出来的表的'dynamic_partition_enable'属性值会设置为 false。
- "timeout" = "3600"：任务超时时间，默认为一天。单位秒。
- "meta_version" = 40：使用指定的 meta_version 来读取之前备份的元数据。注意，该参数作为临时方案，仅用于恢复老版本
Doris 备份的数据。最新版本的备份数据中已经包含 meta version，无需再指定。
+- "clean_tables": 表示是否清理不属于恢复目标的表。例如，如果恢复之前的目标数据库有备份中不存在的表，指定 `clean_tables`
就可以在恢复期间删除这些额外的表并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "clean_partitions"：表示是否清理不属于恢复目标的分区。例如，如果恢复之前的目标表有备份中不存在的分区，指定
`clean_partitions` 就可以在恢复期间删除这些额外的分区并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "atomic_restore"：先将数据加载到临时表中，再以原子方式替换原表，确保恢复过程中不影响目标表的读写。
+- "force_replace"：当表存在且架构与备份表不同时，强制替换。
+ - 注意，要启用 "force_replace"，必须启用 "atomic_restore"
## 可选参数
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index 98227651df5..489b8a5d449 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -65,6 +65,11 @@ FROM `<repository_name>`
- "reserve_dynamic_partition_enable" = "true"：默认为 false。当该属性为 true
时，恢复的表会保留该表备份之前的'dynamic_partition_enable'属性值。该值不为 true
时，则恢复出来的表的'dynamic_partition_enable'属性值会设置为 false。
- "timeout" = "3600"：任务超时时间，默认为一天。单位秒。
- "meta_version" = 40：使用指定的 meta_version 来读取之前备份的元数据。注意，该参数作为临时方案，仅用于恢复老版本
Doris 备份的数据。最新版本的备份数据中已经包含 meta version，无需再指定。
+- "clean_tables": 表示是否清理不属于恢复目标的表。例如，如果恢复之前的目标数据库有备份中不存在的表，指定 `clean_tables`
就可以在恢复期间删除这些额外的表并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "clean_partitions"： 表示是否清理不属于恢复目标的分区。例如，如果恢复之前的目标表有备份中不存在的分区，指定
`clean_partitions` 就可以在恢复期间删除这些额外的分区并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "atomic_restore"：先将数据加载到临时表中，再以原子方式替换原表，确保恢复过程中不影响目标表的读写。
+- "force_replace"：当表存在且结构与备份表不同时，强制替换。
+ - 注意，要启用 "force_replace"，必须启用 "atomic_restore"
## 可选参数
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index 98227651df5..883029dff83 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -65,6 +65,12 @@ FROM `<repository_name>`
- "reserve_dynamic_partition_enable" = "true"：默认为 false。当该属性为 true
时，恢复的表会保留该表备份之前的'dynamic_partition_enable'属性值。该值不为 true
时，则恢复出来的表的'dynamic_partition_enable'属性值会设置为 false。
- "timeout" = "3600"：任务超时时间，默认为一天。单位秒。
- "meta_version" = 40：使用指定的 meta_version 来读取之前备份的元数据。注意，该参数作为临时方案，仅用于恢复老版本
Doris 备份的数据。最新版本的备份数据中已经包含 meta version，无需再指定。
+- "meta_version" = 40：使用指定的 meta_version 来读取之前备份的元数据。注意，该参数作为临时方案，仅用于恢复老版本
Doris 备份的数据。最新版本的备份数据中已经包含 meta version，无需再指定。
+- "clean_tables": 表示是否清理不属于恢复目标的表。例如，如果恢复之前的目标数据库有备份中不存在的表，指定 `clean_tables`
就可以在恢复期间删除这些额外的表并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "clean_partitions"：表示是否清理不属于恢复目标的分区。例如，如果恢复之前的目标表有备份中不存在的分区，指定
`clean_partitions` 就可以在恢复期间删除这些额外的分区并将其移入回收站。该功能自 Apache Doris 2.1.6 版本起支持。
+- "atomic_restore"：先将数据加载到临时表中，再以原子方式替换原表，确保恢复过程中不影响目标表的读写。
+- "force_replace"：当表存在且架构与备份表不同时，强制替换。
+ - 注意，要启用 "force_replace"，必须启用 "atomic_restore"
## 可选参数
diff --git
a/versioned_docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/versioned_docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index a00c52913ff..fef4d4f2656 100644
---
a/versioned_docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/versioned_docs/version-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -66,10 +66,12 @@ Restoration operation attributes, the format is `<key>` =
`<value>`，currently
- "timeout" = "3600": The task timeout period, the default is one day. in
seconds.
- "meta_version" = 40: Use the specified meta_version to read the previously
backed up metadata. Note that this parameter is used as a temporary solution
and is only used to restore the data backed up by the old version of Doris. The
latest version of the backup data already contains the meta version, no need to
specify it.
- "clean_tables" : Indicates whether to clean up tables that do not belong to
the restore target. For example, if the target db before the restore has tables
that are not present in the snapshot, specifying `clean_tables` can drop these
extra tables and move them into the recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
-- "clean_partitions": Indicates whether to clean up partitions that do not
belong to the restore target. For example, if the target table before the
restore has partitions that are not present in the snapshot, specifying
`clean_partitions` can drop these extra partitions and move them into the
recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
-
+ - This feature is supported since the Apache Doris 2.1.6 version
+- "clean_partitions"：Indicates whether to clean up partitions that do not
belong to the restore target. For example, if the target table before the
restore has partitions that are not present in the snapshot, specifying
`clean_partitions` can drop these extra partitions and move them into the
recycle bin during the restore.
+ - This feature is supported since the Apache Doris 2.1.6 version
+- "atomic_restore"：The data will be loaded into a temporary table first, and
then the original table will be replaced atomically to ensure that the read and
write of the target table are not affected during the recovery process.
+- "force_replace"：Force replace when the table exists and the schema is
different with the backup table.
+ - Note that to enable "force_replace", you must enable "atomic_restore"
## Optional Parameters
**1.`<table_name>`**
diff --git
a/versioned_docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
b/versioned_docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
index 85d0b6727e7..31b860c2073 100644
---
a/versioned_docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
+++
b/versioned_docs/version-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -66,10 +66,12 @@ Restoration operation attributes, the format is `<key>` =
`<value>`，currently
- "timeout" = "3600": The task timeout period, the default is one day. in
seconds.
- "meta_version" = 40: Use the specified meta_version to read the previously
backed up metadata. Note that this parameter is used as a temporary solution
and is only used to restore the data backed up by the old version of Doris. The
latest version of the backup data already contains the meta version, no need to
specify it.
- "clean_tables" : Indicates whether to clean up tables that do not belong to
the restore target. For example, if the target db before the restore has tables
that are not present in the snapshot, specifying `clean_tables` can drop these
extra tables and move them into the recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
-- "clean_partitions": Indicates whether to clean up partitions that do not
belong to the restore target. For example, if the target table before the
restore has partitions that are not present in the snapshot, specifying
`clean_partitions` can drop these extra partitions and move them into the
recycle bin during the restore.
- - This feature is supported since the Apache Doris 1.2.6 version
-
+ - This feature is supported since the Apache Doris 2.1.6 version
+- "clean_partitions"：Indicates whether to clean up partitions that do not
belong to the restore target. For example, if the target table before the
restore has partitions that are not present in the snapshot, specifying
`clean_partitions` can drop these extra partitions and move them into the
recycle bin during the restore.
+ - This feature is supported since the Apache Doris 2.1.6 version
+- "atomic_restore"： The data will be loaded into a temporary table first, and
then the original table will be replaced atomically to ensure that the read and
write of the target table are not affected during the recovery process.
+- "force_replace"：Force replace when the table exists and the schema is
different with the backup table.
+ - Note that to enable "force_replace", you must enable "atomic_restore"
## Optional Parameters
**1.`<table_name>`**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
