From 6360049e2085b04858719fb9f8577773944e4f49 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Thu, 23 Jul 2026 17:02:38 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #23348 Signed-off-by: ti-chi-bot --- develop/dev-guide-transaction-restraints.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/develop/dev-guide-transaction-restraints.md b/develop/dev-guide-transaction-restraints.md index 3135f606bc6d6..a8a33f9307ba9 100644 --- a/develop/dev-guide-transaction-restraints.md +++ b/develop/dev-guide-transaction-restraints.md @@ -714,7 +714,11 @@ The basic principle is to limit the size of the transaction. At the KV level, Ti - You can adjust it by using the [`performance.txn-entry-size-limit`](https://docs.pingcap.com/tidb/stable/tidb-configuration-file#txn-entry-size-limit-new-in-v4010-and-v500) configuration parameter of tidb-server for TiDB v4.0.10 and later v4.0.x versions, TiDB v5.0.0 and later versions. The value is `6 MB` for versions earlier than v4.0.10. - Starting from v7.6.0, you can use the [`tidb_txn_entry_size_limit`](/system-variables.md#tidb_txn_entry_size_limit-new-in-v760) system variable to dynamically modify the value of this configuration item. +<<<<<<< HEAD - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both `tidb_txn_entry_size_limit` in TiDB and `raftstore.raft-entry-max-size` in TiKV. +======= + - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both `tidb_txn_entry_size_limit` for TiDB and `raftstore.raft-entry-max-size` for TiKV. +>>>>>>> 499c12a01f (Clarify TiKV large-row limit in transaction restraints (#23338) (#23348)) - The maximum single transaction size supported is 1 TiB. From aa6d11667453e380d879b43f9714e87152ce627f Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sat, 25 Jul 2026 12:11:34 +0800 Subject: [PATCH 2/3] Update develop/dev-guide-transaction-restraints.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- develop/dev-guide-transaction-restraints.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/develop/dev-guide-transaction-restraints.md b/develop/dev-guide-transaction-restraints.md index a8a33f9307ba9..f4d3fa584da04 100644 --- a/develop/dev-guide-transaction-restraints.md +++ b/develop/dev-guide-transaction-restraints.md @@ -714,11 +714,7 @@ The basic principle is to limit the size of the transaction. At the KV level, Ti - You can adjust it by using the [`performance.txn-entry-size-limit`](https://docs.pingcap.com/tidb/stable/tidb-configuration-file#txn-entry-size-limit-new-in-v4010-and-v500) configuration parameter of tidb-server for TiDB v4.0.10 and later v4.0.x versions, TiDB v5.0.0 and later versions. The value is `6 MB` for versions earlier than v4.0.10. - Starting from v7.6.0, you can use the [`tidb_txn_entry_size_limit`](/system-variables.md#tidb_txn_entry_size_limit-new-in-v760) system variable to dynamically modify the value of this configuration item. -<<<<<<< HEAD - - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both `tidb_txn_entry_size_limit` in TiDB and `raftstore.raft-entry-max-size` in TiKV. -======= - - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both `tidb_txn_entry_size_limit` for TiDB and `raftstore.raft-entry-max-size` for TiKV. ->>>>>>> 499c12a01f (Clarify TiKV large-row limit in transaction restraints (#23338) (#23348)) + - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both the TiDB row-size limit (`performance.txn-entry-size-limit`, or `tidb_txn_entry_size_limit` starting from v7.6.0) and `raftstore.raft-entry-max-size` in TiKV. - The maximum single transaction size supported is 1 TiB. From 341b306f856f48c397b3576f5d267ed633b6681a Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Sat, 25 Jul 2026 12:12:39 +0800 Subject: [PATCH 3/3] Update develop/dev-guide-transaction-restraints.md --- develop/dev-guide-transaction-restraints.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/develop/dev-guide-transaction-restraints.md b/develop/dev-guide-transaction-restraints.md index f4d3fa584da04..51cc721bfd3ae 100644 --- a/develop/dev-guide-transaction-restraints.md +++ b/develop/dev-guide-transaction-restraints.md @@ -714,7 +714,7 @@ The basic principle is to limit the size of the transaction. At the KV level, Ti - You can adjust it by using the [`performance.txn-entry-size-limit`](https://docs.pingcap.com/tidb/stable/tidb-configuration-file#txn-entry-size-limit-new-in-v4010-and-v500) configuration parameter of tidb-server for TiDB v4.0.10 and later v4.0.x versions, TiDB v5.0.0 and later versions. The value is `6 MB` for versions earlier than v4.0.10. - Starting from v7.6.0, you can use the [`tidb_txn_entry_size_limit`](/system-variables.md#tidb_txn_entry_size_limit-new-in-v760) system variable to dynamically modify the value of this configuration item. - - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both the TiDB row-size limit (`performance.txn-entry-size-limit`, or `tidb_txn_entry_size_limit` starting from v7.6.0) and `raftstore.raft-entry-max-size` in TiKV. + - Note that TiKV also limits the data size of a single write request. If the data size of a single write request exceeds [`raftstore.raft-entry-max-size`](/tikv-configuration-file.md#raft-entry-max-size), which is `8 MiB` by default, TiKV rejects the request. When a single row is large, you need to adjust both `tidb_txn_entry_size_limit` for TiDB and `raftstore.raft-entry-max-size` for TiKV. - The maximum single transaction size supported is 1 TiB.