Skip to content

*: refactor transaction documents (#2088)#2157

Merged
anotherrachel merged 4 commits into
pingcap:release-3.0from
sre-bot:release-3.0-cbc27e07aba3
Apr 3, 2020
Merged

*: refactor transaction documents (#2088)#2157
anotherrachel merged 4 commits into
pingcap:release-3.0from
sre-bot:release-3.0-cbc27e07aba3

Conversation

@sre-bot
Copy link
Copy Markdown
Contributor

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

cherry-pick #2088 to release-3.0


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)?

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Apr 3, 2020
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-3.0 This PR is cherry-picked to release-3.0 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
@anotherrachel anotherrachel force-pushed the release-3.0-cbc27e07aba3 branch from d742c92 to ae48a36 Compare April 3, 2020 10:45
@anotherrachel anotherrachel force-pushed the release-3.0-cbc27e07aba3 branch from ae48a36 to 1e7db3a Compare April 3, 2020 10:56
Copy link
Copy Markdown
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 status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. and removed contribution This PR is from a community contributor. status/can-merge Indicates a PR has been approved by a committer. labels Apr 3, 2020
Copy link
Copy Markdown

@youjiali1995 youjiali1995 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 merged commit 8dfc401 into pingcap:release-3.0 Apr 3, 2020
@sre-bot
Copy link
Copy Markdown
Contributor Author

sre-bot commented Apr 3, 2020

/run-all-tests

@anotherrachel anotherrachel removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. type/cherry-pick-for-release-3.0 This PR is cherry-picked to release-3.0 from a source PR. type/refactor The issue belongs to a refactor work.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants