This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 aa2112272ed move txn doc (#883)
aa2112272ed is described below
commit aa2112272ed252a38b182f6a788f23260c7e6d42
Author: meiyi <myime...@gmail.com>
AuthorDate: Mon Jul 22 10:00:37 2024 +0800
move txn doc (#883)
---
.../{import/transaction-load-manual.md => transaction.md} | 10 +++++-----
.../{import/transaction-load-manual.md => transaction.md} | 10 +++++-----
sidebars.json | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/data-operate/import/transaction-load-manual.md
b/docs/data-operate/transaction.md
similarity index 93%
rename from docs/data-operate/import/transaction-load-manual.md
rename to docs/data-operate/transaction.md
index e599c950dd4..417fe46f9f7 100644
--- a/docs/data-operate/import/transaction-load-manual.md
+++ b/docs/data-operate/transaction.md
@@ -1,6 +1,6 @@
---
{
- "title": "Transaction Load",
+ "title": "Transaction",
"language": "en"
}
---
@@ -40,13 +40,13 @@ Explicit transactions require users to actively start,
commit, or roll back tran
COMMIT; / ROLLBACK;
```
-2. [Stream Load 2PC](load-atomicity.md#stream-load)
+2. [Stream Load 2PC](import/load-atomicity.md#stream-load)
### Implicit Transactions
Implicit transactions refer to SQL statements that are executed without
explicitly adding statements to start and commit transactions before and after
the statements.
-In Doris, except for [Group Commit](group-commit-manual.md), each import
statement opens a transaction when it starts executing. The transaction is
automatically committed after the statement is executed, or automatically
rolled back if the statement fails. For more information, see [Transaction
Load](load-atomicity.md).
+In Doris, except for [Group Commit](import/group-commit-manual.md), each
import statement opens a transaction when it starts executing. The transaction
is automatically committed after the statement is executed, or automatically
rolled back if the statement fails. For more information, see [Transaction
Load](import/load-atomicity.md).
## Transaction Operations
@@ -123,7 +123,7 @@ This method not only achieves atomicity, but also in Doris,
it enhances the writ
If user enables `Group Commit` and transaction insert at the same time, the
transaction insert will work.
-See [Insert Into](load-atomicity.md#insert-into) for more details.
+See [Insert Into](import/load-atomicity.md#insert-into) for more details.
### Multiple `INSERT INTO SELECT`, `UPDATE`, `DELETE` for multiple tables
@@ -371,7 +371,7 @@ mysql> SELECT * FROM dt3;
* Mixing the two transaction load of `INSERT INTO SELECT`, `UPDATE`, `DELETE`
and `INSERT INTO VALUES` is not allowed; otherwise, you will encounter the
error `Transaction insert can not insert into values and insert into select at
the same time`.
-* [Delete Command](../delete/delete-manual.md) supports delete by specifying a
filter predicate or using clause, to guarantee the isolation, currently only
support that, the delete operations must before the insert operations for one
table in one transaction, otherwise, you will encounter the error `Can not
delete because there is a insert operation for the same table`.
+* [Delete Command](delete/delete-manual.md) supports delete by specifying a
filter predicate or using clause, to guarantee the isolation, currently only
support that, the delete operations must before the insert operations for one
table in one transaction, otherwise, you will encounter the error `Can not
delete because there is a insert operation for the same table`.
* If the time-consuming from `BEGIN` statement exceeds the timeout configured
in Doris, the transaction will be rolled back. Currently, the timeout uses the
maximum value of session variables `insert_timeout` and `query_timeout`.
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/import/transaction-load-manual.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/transaction.md
similarity index 93%
rename from
i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/import/transaction-load-manual.md
rename to
i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/transaction.md
index af17b329f6b..a5f1847de0d 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/import/transaction-load-manual.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/data-operate/transaction.md
@@ -1,6 +1,6 @@
---
{
- "title": "Transaction Load",
+ "title": "事务",
"language": "zh-CN"
}
---
@@ -40,13 +40,13 @@ under the License.
COMMIT; / ROLLBACK;
```
-2. [Stream Load 2PC](load-atomicity.md#stream-load)
+2. [Stream Load 2PC](import/load-atomicity.md#stream-load)
### 隐式事务
隐式事务是指用户在所执行的一条或多条SQL语句的前后，没有显式添加开启事务和提交事务的语句。
-在 Doris 中，除[Group
Commit](group-commit-manual.md)外，每个导入语句在开始执行时都会开启一个事务，并且在该语句执行完成之后，自动提交该事务；或执行失败后，自动回滚该事务。更多详细信息请参考:
[导入事务与原子性](load-atomicity.md)。
+在 Doris 中，除[Group
Commit](import/group-commit-manual.md)外，每个导入语句在开始执行时都会开启一个事务，并且在该语句执行完成之后，自动提交该事务；或执行失败后，自动回滚该事务。更多详细信息请参考:
[导入事务与原子性](import/load-atomicity.md)。
## 事务操作
@@ -123,7 +123,7 @@ Query OK, 0 rows affected (1.02 sec)
如果用户同时开启了 `Group Commit` 和事务写，事务写生效。
-也可以参考 [Insert Into](load-atomicity.md#insert-into)获取更多信息。
+也可以参考 [Insert Into](import/load-atomicity.md#insert-into)获取更多信息。
### 多表多次`INSERT INTO SELECT`, `UPDATE`, `DELETE`写入
@@ -371,7 +371,7 @@ mysql> SELECT * FROM dt3;
* 两种事务写入`INSERT INTO SELECT`, `UPDATE`, `DELETE` 和 `INSET INTO VALUES`
不能混用，否则会遇到错误 `Transaction insert can not insert into values and insert into
select at the same time`
-* [Delete 操作](../delete/delete-manual.md)提供了通过谓词和 Using
子句两种方式，为了保证隔离级别，在一个事务中，对相同表的删除必须在写入前，否则会遇到报错 `Can not delete because there is a
insert operation for the same table`
+* [Delete 操作](delete/delete-manual.md)提供了通过谓词和 Using
子句两种方式，为了保证隔离级别，在一个事务中，对相同表的删除必须在写入前，否则会遇到报错 `Can not delete because there is a
insert operation for the same table`
* 当从 `BEGIN` 开始的导入耗时超出 Doris 配置的 timeout 时，会导致事务回滚，导入失败。目前 timeout 使用的是
Session 变量 `insert_timeout` 和 `query_timeout` 的最大值
diff --git a/sidebars.json b/sidebars.json
index 275c2507431..b0f6da11361 100644
--- a/sidebars.json
+++ b/sidebars.json
@@ -113,7 +113,6 @@
"data-operate/import/routine-load-manual",
"data-operate/import/insert-into-manual",
"data-operate/import/mysql-load-manual",
- "data-operate/import/transaction-load-manual",
"data-operate/import/load-json-format",
"data-operate/import/migrate-data-from-other-olap",
"data-operate/import/group-commit-manual",
@@ -161,7 +160,8 @@
"items": [
"data-operate/scheduler/job-scheduler"
]
- }
+ },
+ "data-operate/transaction"
]
},
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
