From 16012ee4cd5e858ca9beb8db0827288f13ca4a3e Mon Sep 17 00:00:00 2001 From: Nullnotnil Date: Fri, 3 Jul 2020 07:31:51 -0600 Subject: [PATCH 1/3] optimistic-transaction: remove reference to being "default" No longer accurate in 3.0+ --- optimistic-transaction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimistic-transaction.md b/optimistic-transaction.md index 5bf3f5d870aa7..2cc56cbbbd6a6 100644 --- a/optimistic-transaction.md +++ b/optimistic-transaction.md @@ -9,7 +9,7 @@ aliases: ['/docs/dev/optimistic-transaction/','/docs/dev/reference/transactions/ This document introduces the principles of TiDB's optimistic transaction model and related features. -TiDB uses the optimistic transaction model by default. In TiDB's optimistic transaction model, for write-write conflicts, the two-phase commit begins only when the transaction is committed. +In TiDB's optimistic transaction model, for write-write conflicts, the two-phase commit begins only when the transaction is committed. > **Note:** > From 35b97c0bcbdb18cde17552bc91e19d7d554ee97f Mon Sep 17 00:00:00 2001 From: Null not nil <67764674+nullnotnil@users.noreply.github.com> Date: Tue, 7 Jul 2020 09:14:45 -0600 Subject: [PATCH 2/3] Update optimistic-transaction.md Co-authored-by: Jack Yu --- optimistic-transaction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimistic-transaction.md b/optimistic-transaction.md index 2cc56cbbbd6a6..2bbd48f0afbb2 100644 --- a/optimistic-transaction.md +++ b/optimistic-transaction.md @@ -9,7 +9,7 @@ aliases: ['/docs/dev/optimistic-transaction/','/docs/dev/reference/transactions/ This document introduces the principles of TiDB's optimistic transaction model and related features. -In TiDB's optimistic transaction model, for write-write conflicts, the two-phase commit begins only when the transaction is committed. +In TiDB's optimistic transaction model, detecting the write-write conflicts only happens when committing the transaction via two-phase commit. > **Note:** > From 7155cbc03496db8be34231eaf3720b97e2d2b449 Mon Sep 17 00:00:00 2001 From: Null not nil <67764674+nullnotnil@users.noreply.github.com> Date: Wed, 8 Jul 2020 07:28:33 -0600 Subject: [PATCH 3/3] Update optimistic-transaction.md Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com> --- optimistic-transaction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimistic-transaction.md b/optimistic-transaction.md index 2bbd48f0afbb2..f7b9271060142 100644 --- a/optimistic-transaction.md +++ b/optimistic-transaction.md @@ -9,7 +9,7 @@ aliases: ['/docs/dev/optimistic-transaction/','/docs/dev/reference/transactions/ This document introduces the principles of TiDB's optimistic transaction model and related features. -In TiDB's optimistic transaction model, detecting the write-write conflicts only happens when committing the transaction via two-phase commit. +In TiDB's optimistic transaction model, write-write conflicts are detected only at the two-phase transactional commit. > **Note:** >