1

apache · Feb 6, 2025 · 745e5e6 · 745e5e6
1 parent c8abb3c
commit 745e5e6
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 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
@@ -60,9 +60,12 @@ illustrate:
   - "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`
 
 ## Example
 

diff --git a/...rrent/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md b/...rrent/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -54,7 +54,12 @@ PROPERTIES ("key"="value", ...);
   - "reserve_replica" = "true"：默认为 false。当该属性为 true 时，会忽略 replication_num 属性，恢复的表或分区的副本数将与备份之前一样。支持多个表或表内多个分区有不同的副本数。
   - "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/...n-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md b/...n-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -54,8 +54,11 @@ PROPERTIES ("key"="value", ...);
   - "reserve_dynamic_partition_enable" = "true"：默认为 false。当该属性为 true 时，恢复的表会保留该表备份之前的'dynamic_partition_enable'属性值。该值不为 true 时，则恢复出来的表的'dynamic_partition_enable'属性值会设置为 false。该功能自 Apache Doris  1.2 版本起支持。
   - "timeout" = "3600"：任务超时时间，默认为一天。单位秒。
   - "meta_version" = 40：使用指定的 meta_version 来读取之前备份的元数据。注意，该参数作为临时方案，仅用于恢复老版本 Doris 备份的数据。最新版本的备份数据中已经包含 meta version，无需再指定。     
-  -  "clean_tables": 表示是否清理不属于恢复目标的表。例如，如果恢复之前的目标数据库有备份中不存在的表，指定 `clean_tables` 就可以在恢复期间删除这些额外的表并将其移入回收站。该功能自 Apache Doris  1.2.6 版本起支持。
-  - "clean_partitions "：表示是否清理不属于恢复目标的分区。例如，如果恢复之前的目标表有备份中不存在的分区，指定 `clean_partitions` 就可以在恢复期间删除这些额外的分区并将其移入回收站。该功能自 Apache Doris  1.2.6 版本起支持。
+  - "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/...n-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md b/...n-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -54,7 +54,12 @@ PROPERTIES ("key"="value", ...);
   - "reserve_replica" = "true"：默认为 false。当该属性为 true 时，会忽略 replication_num 属性，恢复的表或分区的副本数将与备份之前一样。支持多个表或表内多个分区有不同的副本数。
   - "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/...n-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md b/...n-2.1/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -58,9 +58,12 @@ illustrate:
   - "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`
 
 ## Examples
 

diff --git a/...n-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md b/...n-3.0/sql-manual/sql-statements/data-modification/backup-and-restore/RESTORE.md
@@ -60,9 +60,12 @@ illustrate:
   - "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`
 
 ## Example