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

Support specifying checking forUpdateTS in prewrite #756

Merged
merged 10 commits into from
Apr 17, 2023
Merged

Support specifying checking forUpdateTS in prewrite #756

merged 10 commits into from
Apr 17, 2023

Conversation

MyonKeminta
Copy link
Contributor

@MyonKeminta MyonKeminta commented Mar 30, 2023 •
edited
Loading

@MyonKeminta
Support specifying checking forUpdateTS in prewrite
c607c1d 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Fix go mod in tests
c96aff6 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Add test
6616c56 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Fix test
810588c 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Add successful cases to the test
3fb5b6c 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta
Fix test
7dbee0c 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta mentioned this pull request Apr 11, 2023
Merged
12 tasks
@MyonKeminta
Merge branch 'master' of https://github.com/tikv/client-go into m/pre…
e5a35be 
…write-check-for-update-ts
@MyonKeminta
Update dependencies
f3c85c1 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta marked this pull request as ready for review April 13, 2023 09:32
@MyonKeminta
Copy link
Contributor Author

MyonKeminta commented Apr 13, 2023 •
edited
Loading

The integration test failed because pingcap/tikv:nightly on dockerhub failed to be updated. I updated it

@cfzjywxk cfzjywxk requested review from zyguan and you06 April 14, 2023 02:11
cfzjywxk
cfzjywxk approved these changes Apr 14, 2023
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

txnkv/transaction/txn.go Show resolved Hide resolved
@MyonKeminta
Check LockedWithConflictTS greater than requested ForUpdateTS
153f7c9 
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
cfzjywxk
cfzjywxk approved these changes Apr 17, 2023
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

@cfzjywxk
Copy link
Contributor

/merge

@cfzjywxk cfzjywxk merged commit 92db9f7 into tikv:master Apr 17, 2023
@MyonKeminta MyonKeminta deleted the m/prewrite-check-for-update-ts branch April 17, 2023 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

@ekexium ekexium ekexium approved these changes

@zyguan zyguan Awaiting requested review from zyguan

@you06 you06 Awaiting requested review from you06

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MyonKeminta @cfzjywxk @ekexium