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: Update unistore for assertion #29902

Merged
merged 3 commits into from
Dec 9, 2021
Merged

store: Update unistore for assertion #29902

merged 3 commits into from
Dec 9, 2021

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Nov 18, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #26833

What is changed and how it works?

This PR supports assertion for unistore, which will be used by client-go for testing purposes

This PR is split out from #28313

Note that unistore's behavior at AssertionLevel_Fast is not totally the same as TiKV.

(The above PRs will not be merged to master soon. Maybe they can become the feature branch that corresponding to ft-data-inconsistency branch of TiDB. Review them if you have time. Thanks!)

Check List

Tests

  • Unit test

Side effects

-

Documentation

-

Release note

None

@MyonKeminta MyonKeminta added the sig/transaction SIG:Transaction label Nov 18, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 18, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • ekexium

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 added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 18, 2021
cfzjywxk
cfzjywxk approved these changes Nov 29, 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 29, 2021
@cfzjywxk
Copy link
Contributor

@ekexium
PTAL

ekexium
ekexium approved these changes Nov 29, 2021
View reviewed changes
go.mod Outdated
@@ -99,3 +99,5 @@ require (

// FIXME the official repo has some bug makes br_gcs test failed. https://github.com/googleapis/google-cloud-go/pull/3509
// replace cloud.google.com/go/storage => github.com/3pointer/google-cloud-go/storage v1.6.1-0.20210108125931-b59bfa0720b2

replace github.com/pingcap/kvproto => github.com/MyonKeminta/kvproto v0.0.0-20211021102703-60266c23d5bd
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it ready? Shall we merge it first?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It doesn't matter much since we are merging this PR to the development branch. But since we decided to merge the PRs other than TiDB ones, I think that one should be merged first.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 29, 2021
@ekexium ekexium mentioned this pull request Dec 8, 2021
Open
8 tasks
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 8, 2021
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Dec 9, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7f06e98

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 9, 2021
@ekexium ekexium merged commit 583ff25 into pingcap:ft-data-inconsistency Dec 9, 2021
@MyonKeminta MyonKeminta deleted the m/unistore-for-assertion branch December 9, 2021 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekexium ekexium ekexium approved these changes

@cfzjywxk cfzjywxk cfzjywxk approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. sig/transaction SIG:Transaction size/L Denotes a PR that changes 100-499 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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MyonKeminta @ti-chi-bot @cfzjywxk @ekexium