Skip to content

Conversation

@ran-huang
Copy link
Contributor

What is changed, added or deleted? (Required)

Update optimistic transaction.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

What is the related PR or file link(s)?

@ran-huang ran-huang added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-4.0 labels Jun 12, 2020
@ran-huang ran-huang requested review from jackysp and yikeke June 12, 2020 06:37
This document introduces the principles of TiDB's optimistic transaction model and related features.

In TiDB's optimistic transaction model, the two-phase commit begins right after the client executes the `COMMIT` statement. Therefore, the write-write conflict can be observed before the transactions are actually committed.
TiDB uses the optimistic transaction model by default. In TiDB's optimistic transaction model, the two-phase commit begins only after the transaction is committed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second sentence is not aligned with https://github.com/pingcap/docs-cn/pull/3171/files @ran-huang

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

ran-huang and others added 2 commits June 12, 2020 17:14
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ran-huang
Copy link
Contributor Author

@jackysp PTAL~

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jackysp
Copy link
Member

jackysp commented Jun 15, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2020
@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 2835

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 67930dd into pingcap:master Jun 15, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jun 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #2869

ti-srebot added a commit that referenced this pull request Jun 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ran-huang ran-huang deleted the optim-txn branch June 15, 2020 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/can-merge Indicates a PR has been approved by a committer. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants