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

store/tikv: remove use of TxnScope transaction option in store/tikv #24365

Merged
merged 10 commits into from
Apr 30, 2021
Merged

store/tikv: remove use of TxnScope transaction option in store/tikv #24365

merged 10 commits into from
Apr 30, 2021

Conversation

disksing
Copy link
Contributor

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

Usage of TxnScope option in store/tikv can be removed.

Part of #24302

What is changed and how it works?

What's Changed:

  • Add scope field to KVTxn.
  • Add SetScope GetScope methods
  • Adapt option in txn_driver

Check List

Tests

  • Unit test

Release note

  • No release note

@disksing disksing added the sig/transaction SIG:Transaction label Apr 28, 2021
@disksing disksing added this to In Review in Standalone TiKV Go Client via automation Apr 28, 2021
@disksing disksing requested a review from a team as a code owner April 28, 2021 21:20
@disksing disksing requested review from lzmhhh123 and removed request for a team April 28, 2021 21:20
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 28, 2021
disksing
disksing commented Apr 28, 2021
View reviewed changes
store/tikv/snapshot.go
@@ -93,7 +93,6 @@ type KVSnapshot struct {
matchStoreLabels []*metapb.StoreLabel
}
sampleStep uint32
txnScope string
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this unused variable redundant or will it be used in the future? cc @Yisaer

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is introduced by #22789, is this ok to be removed? @sticnarf

@github-actions github-actions bot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra labels Apr 28, 2021
AndreMouche
AndreMouche approved these changes Apr 29, 2021
View reviewed changes
Copy link
Contributor

@AndreMouche AndreMouche 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 29, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AndreMouche
  • youjiali1995

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Apr 29, 2021
@youjiali1995
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ed337cc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 29, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 29, 2021
@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 29, 2021
@disksing
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 973c1a0

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 29, 2021
@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

@ti-chi-bot
Copy link
Member

/run-all-tests

This bot automatically retries jobs that failed on can merge PRs (send feedback to hi-rustin).

Silence the bot with the /merge cancel comment for consistent failures.

@ti-chi-bot
Copy link
Member

@disksing: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

@disksing
Copy link
Contributor Author

/run-all-tests

@disksing
Copy link
Contributor Author

/run-check_dev_2

@ti-chi-bot ti-chi-bot merged commit a9a5e05 into pingcap:master Apr 30, 2021
Standalone TiKV Go Client automation moved this from In Review to Done Apr 30, 2021
@disksing disksing deleted the txnscope branch April 30, 2021 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndreMouche AndreMouche AndreMouche approved these changes

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@Yisaer Yisaer Awaiting requested review from Yisaer

@lzmhhh123 lzmhhh123 Awaiting requested review from lzmhhh123

Assignees
No one assigned
Labels
sig/execution SIG execution sig/sql-infra SIG: SQL Infra sig/transaction SIG: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.
Projects
No open projects
Standalone TiKV Go Client
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@disksing @ti-chi-bot @youjiali1995 @AndreMouche @Yisaer