Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the description of pessimistic transaction #7247

Merged
merged 9 commits into from
Nov 15, 2021
Merged

Update the description of pessimistic transaction #7247

merged 9 commits into from
Nov 15, 2021

Conversation

qiancai
Copy link
Collaborator

@qiancai qiancai commented Oct 9, 2021 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

Background: Feedback from @tshqin: tidb 只有一种事务模型：乐观实物模型，悲观锁是在乐观事务模型上做出来的。所有"悲观事务模型"措辞都是错误的，需要改为“悲观锁”或者“悲观事务模式”
Changes: 悲观事务模型 -> 悲观事务模式

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

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

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

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 9, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot requested a review from TomShawn October 9, 2021 08:11
@qiancai qiancai self-assigned this Oct 9, 2021
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 9, 2021
@qiancai qiancai added translation/doing This PR’s assignee is translating this PR. and removed missing-translation-status This PR does not have translation status info. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 9, 2021
@qiancai qiancai requested review from tshqin and cfzjywxk October 9, 2021 08:12
@TomShawn TomShawn added area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. type/bugfix This PR fixes a bug. labels Oct 9, 2021
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 9, 2021
@TomShawn TomShawn added area/transaction Indicates that the Issue or PR belongs to the area of transaction. and removed area/scheduling Indicates that the Issue or PR belongs to the area of scheduling. labels Oct 9, 2021
@qiancai
Copy link
Collaborator Author

qiancai commented Oct 12, 2021

@tshqin @cfzjywxk Would you please check and approve the PR if the content updates are correct? Thanks.

cfzjywxk
cfzjywxk approved these changes Oct 12, 2021
View reviewed changes
Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

@cfzjywxk: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

tshqin
tshqin approved these changes Nov 14, 2021
View reviewed changes
Copy link
Contributor

@tshqin tshqin left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

@tshqin: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 15, 2021
@TomShawn
Copy link
Contributor

/remove-status LGT1
/status LGT2

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 15, 2021
TomShawn
TomShawn reviewed Nov 15, 2021
View reviewed changes
system-variables.md Outdated Show resolved Hide resolved
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: d3dfc81

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 15, 2021
@ti-chi-bot ti-chi-bot merged commit 2a8063b into pingcap:master Nov 15, 2021
@qiancai qiancai mentioned this pull request Nov 24, 2021
Merged
14 tasks
@qiancai qiancai added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Nov 24, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 7, 2021
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

@tshqin tshqin tshqin approved these changes

@cfzjywxk cfzjywxk cfzjywxk approved these changes

Assignees

@qiancai qiancai

Labels
area/transaction Indicates that the Issue or PR belongs to the area of transaction. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@qiancai @ti-chi-bot @TomShawn @cfzjywxk @tshqin