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

*: refactor transaction documents (#2088) #2156

Merged
merged 4 commits into from
Apr 3, 2020
Merged

*: refactor transaction documents (#2088) #2156

merged 4 commits into from
Apr 3, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 3, 2020

cherry-pick #2088 to release-2.1

What is changed, added or deleted? (Required)

Original PR: #1695 (closed)

This PR refactors and updates transaction-related documents, including:

  • Split and merge the current Optimistic Locking best practice doc into existing Transaction Documents (because it is not a best practice doc, rather, it is a compilation of existing content on transactions.)
  • The Transaction Overview doc include content applicable to both Optimistic Transaction and Pessimistic Transaction
  • The previous Transaction Model is now changed to Optimistic Transaction

Version differences: pingcap/docs-cn#2255

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

  • master (the latest development version, including v4.0 changes for now)
  • 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-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

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

@sre-bot
cherry pick pingcap#2088 to release-2.1
5dbb5b1 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Apr 3, 2020
Merged
4 tasks
@sre-bot sre-bot added contribution This PR is from a community contributor. size/large Changes of a large size. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. type/refactor The issue belongs to a refactor work. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Apr 3, 2020
yikeke
yikeke reviewed Apr 3, 2020
View reviewed changes
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@anotherrachel anotherrachel added the status/can-merge Indicates a PR has been approved by a committer. label Apr 3, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 3, 2020

/run-all-tests

@sre-bot sre-bot merged commit 8905810 into pingcap:release-2.1 Apr 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yikeke yikeke yikeke left review comments

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@TomShawn TomShawn Awaiting requested review from TomShawn

@anotherrachel anotherrachel Awaiting requested review from anotherrachel

Assignees
No one assigned
Labels
contribution This PR is from a community contributor. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. status/can-merge Indicates a PR has been approved by a committer. type/cherry-pick-for-release-2.1 This PR is cherry-picked to release-2.1 from a source PR. type/refactor The issue belongs to a refactor work.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sre-bot @youjiali1995 @yikeke @anotherrachel